diff --git a/.eslintrc.js b/.eslintrc.js
index aad33221..3ca4f190 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -27,11 +27,7 @@ module.exports = {
     'generator-star-spacing': 0,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'no-console': process.env.NODE_ENV === 'production'
-      ? [2, {
-        'allow': ['error', 'warn']
-      }]
-      : 0,
+    'no-console': process.env.NODE_ENV === 'production' ? [2, { 'allow': ['error', 'warn'] }] : 0,
     'comma-dangle': ['error', 'always-multiline'],
   },
 }
diff --git a/.gitignore b/.gitignore
index d58f498a..e5ae349f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,34 @@
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
 ### Node template
 node_modules
 # Logs
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6b326c6b..5b897998 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,9 +2,58 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <CssCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+      <option name="HEX_COLOR_LONG_FORMAT" value="true" />
+    </CssCodeStyleSettings>
+    <DB2CodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </DB2CodeStyleSettings>
+    <DerbyCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </DerbyCodeStyleSettings>
+    <GoCodeStyleSettings>
+      <option name="ADD_LEADING_SPACE_TO_COMMENTS" value="true" />
+      <option name="IMPORT_SORTING" value="GOIMPORTS" />
+      <option name="MOVE_ALL_IMPORTS_IN_ONE_DECLARATION" value="true" />
+      <option name="MOVE_ALL_STDLIB_IMPORTS_IN_ONE_GROUP" value="true" />
+      <option name="GROUP_STDLIB_IMPORTS" value="true" />
+      <option name="GROUP_CURRENT_PROJECT_IMPORTS" value="true" />
+    </GoCodeStyleSettings>
+    <H2CodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+    </H2CodeStyleSettings>
+    <HSQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+    </HSQLCodeStyleSettings>
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+      <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,thead,tbody,tfoot" />
+    </HTMLCodeStyleSettings>
     <JSCodeStyleSettings version="0">
       <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
@@ -12,19 +61,101 @@
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
       <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
       <option name="IMPORT_SORT_MODULE_NAME" value="true" />
+      <option name="IMPORT_PREFER_ABSOLUTE_PATH" value="TRUE" />
     </JSCodeStyleSettings>
+    <MSSQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </MSSQLCodeStyleSettings>
+    <MySQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+    </MySQLCodeStyleSettings>
+    <OracleCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
       <option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
       <option name="ALIGN_PHPDOC_COMMENTS" value="true" />
       <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
+      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
+      <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
       <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
       <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
       <option name="LOWER_CASE_NULL_CONST" value="true" />
+      <option name="ELSE_IF_STYLE" value="COMBINE" />
       <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
       <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+      <option name="NULL_TYPE_POSITION" value="IN_THE_BEGINNING" />
+      <option name="IF_RPAREN_ON_NEXT_LINE" value="true" />
     </PHPCodeStyleSettings>
+    <PostgresCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </PostgresCodeStyleSettings>
+    <SQLiteCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+    </SQLiteCodeStyleSettings>
+    <ScssCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+      <option name="HEX_COLOR_LONG_FORMAT" value="true" />
+    </ScssCodeStyleSettings>
+    <SqlCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </SqlCodeStyleSettings>
+    <SybaseCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="POST_OPT_WRAP_1" value="true" />
+      <option name="IMP_DECLARE_EL_WRAP" value="1" />
+      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
+    </SybaseCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
+      <option name="IMPORT_PREFER_ABSOLUTE_PATH" value="TRUE" />
+    </TypeScriptCodeStyleSettings>
+    <XML>
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
     <codeStyleSettings language="CFML">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
@@ -50,6 +181,10 @@
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
     </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -78,20 +213,23 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="PHP">
+      <option name="RIGHT_MARGIN" value="120" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="EXTENDS_LIST_WRAP" value="5" />
-      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="ARRAY_INITIALIZER_WRAP" value="5" />
       <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
       <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
@@ -99,6 +237,109 @@
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
+      <arrangement>
+        <groups />
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <TRAIT>true</TRAIT>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <CONST>true</CONST>
+                  <visibility />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PUBLIC>true</PUBLIC>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PROTECTED>true</PROTECTED>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PRIVATE>true</PRIVATE>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <CONSTRUCTOR>true</CONSTRUCTOR>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PUBLIC>true</PUBLIC>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PROTECTED>true</PROTECTED>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PRIVATE>true</PRIVATE>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="PostgreSQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    </codeStyleSettings>
+    <codeStyleSettings language="SQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
     <codeStyleSettings language="TypeScript">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
@@ -121,8 +362,17 @@
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
+    <codeStyleSettings language="yaml">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Default.xml b/.idea/inspectionProfiles/Default.xml
index 6a23a214..4b90faf0 100644
--- a/.idea/inspectionProfiles/Default.xml
+++ b/.idea/inspectionProfiles/Default.xml
@@ -4,7 +4,77 @@
     <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CssUnknownTarget" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="50" name="JavaScript" />
+      </Languages>
+    </inspection_tool>
     <inspection_tool class="Eslint" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="configuration">
+        <list>
+          <option value="\Codeception\Util\Debug::debug" />
+          <option value="\Codeception\Util\Debug::pause" />
+          <option value="\Doctrine\Common\Util\Debug::dump" />
+          <option value="\Doctrine\Common\Util\Debug::export" />
+          <option value="\Illuminate\Support\Debug\Dumper::dump" />
+          <option value="\Symfony\Component\Debug\Debug::enable" />
+          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
+          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
+          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
+          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
+          <option value="\Zend\Debug\Debug::dump" />
+          <option value="\Zend\Di\Display\Console::export" />
+          <option value="dd" />
+          <option value="debug_print_backtrace" />
+          <option value="debug_zval_dump" />
+          <option value="dpm" />
+          <option value="dpq" />
+          <option value="dsm" />
+          <option value="dvm" />
+          <option value="error_log" />
+          <option value="kpr" />
+          <option value="phpinfo" />
+          <option value="print_r" />
+          <option value="var_dump" />
+          <option value="var_export" />
+          <option value="xdebug_break" />
+          <option value="xdebug_call_class" />
+          <option value="xdebug_call_file" />
+          <option value="xdebug_call_function" />
+          <option value="xdebug_call_line" />
+          <option value="xdebug_code_coverage_started" />
+          <option value="xdebug_debug_zval" />
+          <option value="xdebug_debug_zval_stdout" />
+          <option value="xdebug_dump_superglobals" />
+          <option value="xdebug_enable" />
+          <option value="xdebug_get_code_coverage" />
+          <option value="xdebug_get_collected_errors" />
+          <option value="xdebug_get_declared_vars" />
+          <option value="xdebug_get_function_stack" />
+          <option value="xdebug_get_headers" />
+          <option value="xdebug_get_monitored_functions" />
+          <option value="xdebug_get_profiler_filename" />
+          <option value="xdebug_get_stack_depth" />
+          <option value="xdebug_get_tracefile_name" />
+          <option value="xdebug_is_enabled" />
+          <option value="xdebug_memory_usage" />
+          <option value="xdebug_peak_memory_usage" />
+          <option value="xdebug_print_function_stack" />
+          <option value="xdebug_start_code_coverage" />
+          <option value="xdebug_start_error_collection" />
+          <option value="xdebug_start_function_monitor" />
+          <option value="xdebug_start_trace" />
+          <option value="xdebug_stop_code_coverage" />
+          <option value="xdebug_stop_error_collection" />
+          <option value="xdebug_stop_function_monitor" />
+          <option value="xdebug_stop_trace" />
+          <option value="xdebug_time_index" />
+          <option value="xdebug_var_dump" />
+        </list>
+      </option>
+      <option name="migratedIntoUserSpace" value="true" />
+    </inspection_tool>
     <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
         <value>
@@ -50,7 +120,7 @@
     <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
         <value>
-          <list size="14">
+          <list size="27">
             <item index="0" class="java.lang.String" itemvalue="nobr" />
             <item index="1" class="java.lang.String" itemvalue="noembed" />
             <item index="2" class="java.lang.String" itemvalue="comment" />
@@ -65,16 +135,89 @@
             <item index="11" class="java.lang.String" itemvalue="vl-view" />
             <item index="12" class="java.lang.String" itemvalue="vl-layer-tile" />
             <item index="13" class="java.lang.String" itemvalue="vl-source-osm" />
+            <item index="14" class="java.lang.String" itemvalue="vl-source-xyz" />
+            <item index="15" class="java.lang.String" itemvalue="vl-layer-vector" />
+            <item index="16" class="java.lang.String" itemvalue="vl-source-vector" />
+            <item index="17" class="java.lang.String" itemvalue="vl-feature" />
+            <item index="18" class="java.lang.String" itemvalue="vl-geom-point" />
+            <item index="19" class="java.lang.String" itemvalue="vl-style-box" />
+            <item index="20" class="java.lang.String" itemvalue="vl-style-text" />
+            <item index="21" class="java.lang.String" itemvalue="vl-style-stroke" />
+            <item index="22" class="java.lang.String" itemvalue="vl-style-fill" />
+            <item index="23" class="java.lang.String" itemvalue="vl-style-icon" />
+            <item index="24" class="java.lang.String" itemvalue="vl-interaction-draw" />
+            <item index="25" class="java.lang.String" itemvalue="vl-interaction-snap" />
+            <item index="26" class="java.lang.String" itemvalue="vl-interaction-modify" />
           </list>
         </value>
       </option>
       <option name="myCustomValuesEnabled" value="true" />
     </inspection_tool>
+    <inspection_tool class="JSCheckFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="JSClosureCompilerSyntax" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateJSDoc" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="RequiredAttributes" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myAdditionalRequiredHtmlAttributes" value="position,points" />
     </inspection_tool>
     <inspection_tool class="ReservedWordUsedAsNameJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="optionConfiguration">
+        <list>
+          <option value="barryvdh/laravel-debugbar" />
+          <option value="behat/behat" />
+          <option value="brianium/paratest" />
+          <option value="codeception/codeception" />
+          <option value="codedungeon/phpunit-result-printer" />
+          <option value="composer/composer" />
+          <option value="doctrine/coding-standard" />
+          <option value="filp/whoops" />
+          <option value="friendsofphp/php-cs-fixer" />
+          <option value="humbug/humbug" />
+          <option value="infection/infection" />
+          <option value="jakub-onderka/php-parallel-lint" />
+          <option value="johnkary/phpunit-speedtrap" />
+          <option value="kalessil/production-dependencies-guard" />
+          <option value="mikey179/vfsStream" />
+          <option value="mockery/mockery" />
+          <option value="mybuilder/phpunit-accelerator" />
+          <option value="orchestra/testbench" />
+          <option value="pdepend/pdepend" />
+          <option value="phan/phan" />
+          <option value="phing/phing" />
+          <option value="phpcompatibility/php-compatibility" />
+          <option value="phpmd/phpmd" />
+          <option value="phpro/grumphp" />
+          <option value="phpspec/phpspec" />
+          <option value="phpspec/prophecy" />
+          <option value="phpstan/phpstan" />
+          <option value="phpunit/phpunit" />
+          <option value="povils/phpmnd" />
+          <option value="roave/security-advisories" />
+          <option value="satooshi/php-coveralls" />
+          <option value="sebastian/phpcpd" />
+          <option value="slevomat/coding-standard" />
+          <option value="spatie/phpunit-watcher" />
+          <option value="squizlabs/php_codesniffer" />
+          <option value="sstalle/php7cc" />
+          <option value="symfony/debug" />
+          <option value="symfony/maker-bundle" />
+          <option value="symfony/phpunit-bridge" />
+          <option value="symfony/var-dumper" />
+          <option value="vimeo/psalm" />
+          <option value="wimg/php-compatibility" />
+          <option value="wp-coding-standards/wpcs" />
+          <option value="yiisoft/yii2-coding-standards" />
+          <option value="yiisoft/yii2-debug" />
+          <option value="yiisoft/yii2-gii" />
+          <option value="zendframework/zend-coding-standard" />
+          <option value="zendframework/zend-debug" />
+          <option value="zendframework/zend-test" />
+        </list>
+      </option>
+    </inspection_tool>
     <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
index 7f6ffce9..cfcfda2e 100644
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,6 +1,5 @@
 <component name="InspectionProjectProfileManager">
   <settings>
-    <option name="projectProfile" value="Default" />
     <option name="PROJECT_PROFILE" value="Default" />
     <version value="1.0" />
   </settings>
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index 9cdc0c17..fd029570 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{HTML, Node.js Core}" />
-    <file url="PROJECT" libraries="{HTML}" />
+    <file url="file://$PROJECT_DIR$" libraries="{HTML, vuelayers/node_modules}" />
+    <file url="PROJECT" libraries="{HTML, vuelayers/node_modules}" />
+    <includedPredefinedLibrary name="Node.js Core" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d56696c5..cd5d6810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="9" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="WebPackConfiguration">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 93ced671..8318b828 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/vuelayers.iml" filepath="$PROJECT_DIR$/vuelayers.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/vuelayers.iml" filepath="$PROJECT_DIR$/.idea/vuelayers.iml" />
     </modules>
   </component>
 </project>
diff --git a/vuelayers.iml b/.idea/vuelayers.iml
similarity index 100%
rename from vuelayers.iml
rename to .idea/vuelayers.iml
diff --git a/.travis.yml b/.travis.yml
index f199bc9a..b16edf49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 sudo: required
 addons:
   apt:
@@ -17,6 +18,7 @@ before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+  - sleep 3
 install:
   - nvm install $NODE_VERSION
   - nvm use $NODE_VERSION
diff --git a/build/rollup.js b/build/rollup.js
index 885d11d0..75a0de37 100644
--- a/build/rollup.js
+++ b/build/rollup.js
@@ -62,13 +62,25 @@ function getAllPackages () {
       globName: config.fullname,
       amdName: config.name,
     },
+    {
+      entry: utils.resolve('src/mixin/index.js'),
+      jsName: 'mixin',
+      pkgName: 'mixin',
+    },
+    {
+      entry: utils.resolve('src/ol-ext/index.js'),
+      jsName: 'ol-ext',
+      pkgName: 'ol-ext',
+    },
+    {
+      entry: utils.resolve('src/rx-ext/index.js'),
+      jsName: 'rx-ext',
+      pkgName: 'rx-ext',
+    },
   ]
 
   return Promise.all([
     packagesFromPath(utils.resolve('src/component'), utils.resolve('src/component')),
-    packagesFromPath(utils.resolve('src/mixin'), srcPath),
-    packagesFromPath(utils.resolve('src/ol-ext'), srcPath),
-    packagesFromPath(utils.resolve('src/rx-ext'), srcPath),
     packagesFromPath(utils.resolve('src/util'), srcPath),
   ]).then(otherPackages => {
     return packages.concat(otherPackages.reduce((all, packages) => all.concat(packages), []))
@@ -128,12 +140,15 @@ function bundleOptions (format, package, env = 'development') {
     if (!parentId) {
       return false
     }
-    if (/\.(sass|vue)$/i.test(id)) {
+    if (/\.(sass|s?css|vue)$/i.test(id)) {
       return false
     }
     // embeddable
-    const embeddableRegExp = /(\.\/|src\/)(install)/i
-    if (embeddableRegExp.test(id)) {
+    const embeddableRegExp = /\/(mixin|ol-ext|rx-ext)\//i
+    if (
+      embeddableRegExp.test(parentId) &&
+      (/^\.\//.test(id) || embeddableRegExp.test(id))
+    ) {
       return false
     }
     // check internal component imports
@@ -174,21 +189,22 @@ function bundleOptions (format, package, env = 'development') {
       options.output.globals = (id) => {
         if (id === 'vue') return 'Vue'
 
-        if (ol[id] != null) {
-          return ol[id]
-        }
+        // if (ol[id] != null) {
+        //   return ol[id]
+        // }
       }
       options.input.external = (id, parent, resolved) => {
         if (['vue'].includes(id)) return true
 
-        if (!resolved && /^ol\/.+/.test(id)) {
-          ol[id] = id.replace(/\//g, '.')
-          return true
-        }
+        // if (!resolved && /^ol\/.+/.test(id)) {
+        //   ol[id] = id.replace(/\//g, '.')
+        //   return true
+        // }
 
         return false
       }
       options.replaces['process.env.NODE_ENV'] = `'${env}'`
+      options.replaces['process.env.VUELAYERS_DEBUG'] = JSON.stringify(process.env.NODE_ENV !== 'production')
       // options.minify = true
       // process.env.BABEL_ENV = 'es5-production'
       // options.defines.IS_STANDALONE = true
@@ -231,7 +247,7 @@ function makeBundle (options = {}) {
         indentedSyntax: true,
         includePaths: [
           utils.resolve('src'),
-          utils.resolve('src/sass'),
+          utils.resolve('src/styles'),
           utils.resolve('node_modules'),
         ],
       },
diff --git a/build/utils.js b/build/utils.js
index a78a20cb..0a3b0e70 100644
--- a/build/utils.js
+++ b/build/utils.js
@@ -62,7 +62,7 @@ function cssLoaders (options) {
     sass: generateLoaders('sass', {
       includePaths: [
         resolve('src'),
-        resolve('src/sass'),
+        resolve('src/styles'),
         resolve('node_modules'),
       ],
       indentedSyntax: true,
@@ -70,7 +70,7 @@ function cssLoaders (options) {
     scss: generateLoaders('sass', {
       includePaths: [
         resolve('src'),
-        resolve('src/sass'),
+        resolve('src/styles'),
         resolve('node_modules'),
       ],
     }),
diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js
index 68948ba2..f8f5e9ec 100644
--- a/build/webpack.base.config.js
+++ b/build/webpack.base.config.js
@@ -1,7 +1,6 @@
 const webpack = require('webpack')
-const WebpackNotifierPlugin = require('webpack-notifier')
 const StringReplacePlugin = require('string-replace-webpack-plugin')
-const {VueLoaderPlugin} = require('vue-loader')
+const { VueLoaderPlugin } = require('vue-loader')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const utils = require('./utils')
@@ -47,9 +46,7 @@ module.exports = {
       // UglifyJs do not support ES6+, you can also use babel-minify for better treeshaking: https://github.com/babel/minify
       new UglifyJsPlugin({
         uglifyOptions: {
-          compress: {
-            warnings: false,
-          },
+          warnings: false,
         },
         cache: true,
         sourceMap: true,
@@ -78,6 +75,15 @@ module.exports = {
           formatter: require('eslint-friendly-formatter'),
         },
       },
+      {
+        test: /\.(js|vue|s?[ca]ss)$/,
+        loader: utils.compileVarsReplaceLoader(),
+        enforce: 'pre',
+        include: [
+          utils.resolve('src'),
+          utils.resolve('test'),
+        ],
+      },
       {
         test: /\.js$/,
         loader: 'babel-loader',
@@ -104,16 +110,13 @@ module.exports = {
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin(Object.assign({}, config.replaces, {
       'process.env.NODE_ENV': `'${process.env.NODE_ENV}'`,
+      'process.env.VUELAYERS_DEBUG': process.env.NODE_ENV !== 'production',
     })),
     new webpack.BannerPlugin({
       banner: config.banner,
       raw: true,
       entryOnly: true,
     }),
-    new WebpackNotifierPlugin({
-      title: config.fullname,
-      alwaysNotify: false,
-    }),
   ],
   performance: {
     maxEntrypointSize: 1024 * 1024, // 1Mb
@@ -130,5 +133,11 @@ module.exports = {
     open: true,
     hot: true,
     contentBase: config.outputPath,
+    clientLogLevel: 'info',
+    compress: true,
+    overlay: { warnings: false, errors: true },
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+    },
   },
 }
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 47cfbb65..7eec3c73 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -51,6 +51,12 @@
 
     * [vl-style-box](/docs/component/style-box.md)
     * [vl-style-circle](/docs/component/circle-style.md)
+    * [vl-style-fill](/docs/component/fill-style.md)
+    * [vl-style-func](/docs/component/func-style.md)
+    * [vl-style-icon](/docs/component/icon-style.md)
+    * [vl-style-reg-shape](/docs/component/reg-shape-style.md)
+    * [vl-style-stroke](/docs/component/stroke-style.md)
+    * [vl-style-text](/docs/component/text-style.md)
 
 * Mixins
   
diff --git a/docs/component/bingmaps-source.md b/docs/component/bingmaps-source.md
index 7f116790..1f6f31ae 100644
--- a/docs/component/bingmaps-source.md
+++ b/docs/component/bingmaps-source.md
@@ -5,11 +5,13 @@
 `vl-source-bingmaps` adds ability to display tile data from Bing Maps. To use
 this source you should get **API key** at https://www.bingmapsportal.com.
 
-## Versions
+## ES6 Module
 
-`vl-source-bingmaps` is a part of **BingmapsSource** module:
+```javascript
+import { BingmapsSource } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/bingmaps-source/
+Vue.use(BingmapsSource)
+```
 
 ## Usage
 
diff --git a/docs/component/circle-geom.md b/docs/component/circle-geom.md
index 5e537237..35e6e2d5 100644
--- a/docs/component/circle-geom.md
+++ b/docs/component/circle-geom.md
@@ -1 +1,61 @@
 # vl-geom-circle
+
+> The circle geometry.
+
+`vl-geom-circle` can be used in a [`vl-feature`](/docs/component/feature.md) to draw circles on the map.
+
+## ES6 Module
+
+```javascript
+import { CircleGeom } from 'vuelayers'
+
+Vue.use(CircleGeom);
+```
+
+## Usage
+
+<vuep template="#circle-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="circle-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-circle :coordinates="[12.492442,41.890170]" :radius="100"></vl-geom-circle>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 17,
+        center: [12.4909725,41.8907348],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[]`
+- **Default**: `[0, 0]`
+
+The center coordinate of the circle in the unit specified by the view's [`projection`](/docs/quickstart.md#global-data-projection).
+
+### radius
+
+- **Type**: `number`
+- **Default**: `0`
+
+The radius of the circle in the unit specified by the view's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/circle-style.md b/docs/component/circle-style.md
index 40bfa5cb..cb455b7a 100644
--- a/docs/component/circle-style.md
+++ b/docs/component/circle-style.md
@@ -1 +1,119 @@
 # vl-style-circle
+
+> Styles points as circles.
+
+Use it inside [`vl-style-box`](/docs/component/style-box.md) to style points as circles.
+
+## ES6 Module
+
+```javascript
+import { CircleStyle } from 'vuelayers'
+
+Vue.use(CircleStyle)
+```
+
+## Usage
+
+Styling a feature inside a vector layer.
+
+<vuep template="#circle-style-feature"></vuep>
+
+<script v-pre type="text/x-template" id="circle-style-feature">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-feature>
+          <vl-geom-point
+            :coordinates="[12.492442,41.890170]" 
+          ></vl-geom-point>
+
+          <vl-style-box>
+            <vl-style-circle :radius="20">
+              <vl-style-fill color="white"></vl-style-fill>
+              <vl-style-stroke color="red"></vl-style-stroke>
+            </vl-style-circle>
+          </vl-style-box>
+        </vl-feature>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+Styling the whole layer
+
+<vuep template="#circle-style-layer"></vuep>
+
+<script v-pre type="text/x-template" id="circle-style-layer">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-source-vector :features="points"></vl-source-vector>
+
+        <vl-style-box>
+          <vl-style-circle :radius="20">
+            <vl-style-fill color="white"></vl-style-fill>
+            <vl-style-stroke color="red"></vl-style-stroke>
+          </vl-style-circle>
+        </vl-style-box>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+        points: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [12.492442,41.890170],
+            },
+            properties: {},
+          }
+        ],
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### radius
+
+- **Type**: `number`
+
+Radius in pixels of the circle.
diff --git a/docs/component/draw-interaction.md b/docs/component/draw-interaction.md
index 843275b6..44dc5fd3 100644
--- a/docs/component/draw-interaction.md
+++ b/docs/component/draw-interaction.md
@@ -1 +1,9 @@
 # vl-interaction-draw
+
+## ES6 Module
+
+```javascript
+import { DrawInteraction } from 'vuelayers'
+
+Vue.use(DrawInteraction)
+```
diff --git a/docs/component/feature.md b/docs/component/feature.md
index d8b88bbc..b625c367 100644
--- a/docs/component/feature.md
+++ b/docs/component/feature.md
@@ -13,11 +13,13 @@ components, without geometry component nothing will be rendered.
 Custom feature styles can be applied with [`vl-style-*`](/docs/component/circle-style.md) 
 components placed inside default slot.
 
-## Versions
+## ES6 Module
 
-`vl-feature` component is a part of **Feature** module:
+```javascript
+import { Feature } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/feature/
+Vue.use(Feature)
+```
 
 ## Usage
 
diff --git a/docs/component/fill-style.md b/docs/component/fill-style.md
new file mode 100644
index 00000000..8a133e02
--- /dev/null
+++ b/docs/component/fill-style.md
@@ -0,0 +1,175 @@
+# vl-style-fill
+
+> Color the filling of a polygon or mulipolygon in a vector layer
+
+Use it inside [`vl-style-box`](/docs/component/style-box.md) along with [`vl-style-stroke`](/docs/component/stroke-style.md) to style polygons and other shapes with area like circles.
+
+## ES6 Module
+
+```javascript
+import { FillStyle } from 'vuelayers'
+
+Vue.use(FillStyle)
+```
+
+## Usage
+
+Styling points like circles with filling.
+
+<vuep template="#fill-style-feature"></vuep>
+
+<script v-pre type="text/x-template" id="fill-style-feature">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-feature>
+          <vl-geom-point
+            :coordinates="[12.492442,41.890170]"
+          ></vl-geom-point>
+
+          <vl-style-box>
+            <vl-style-circle :radius="20">
+              <vl-style-fill color="white"></vl-style-fill>
+              <vl-style-stroke color="red"></vl-style-stroke>
+            </vl-style-circle>
+          </vl-style-box>
+        </vl-feature>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+Styling all features with filling in a layer.
+
+<vuep template="#fill-style-layer"></vuep>
+
+<script v-pre type="text/x-template" id="fill-style-layer">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-source-vector :features="features"></vl-source-vector>
+
+        <vl-style-box>
+          <vl-style-fill color="white"></vl-style-fill>
+          <vl-style-stroke color="red"></vl-style-stroke>
+        </vl-style-box>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+        features: [
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ],
+                  [
+                    12.488279342651365,
+                    41.886687809812926
+                  ],
+                  [
+                    12.489266395568846,
+                    41.89032989704626
+                  ],
+                  [
+                    12.485275268554686,
+                    41.89109662579462
+                  ],
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    12.491540908813477,
+                    41.89288562375104
+                  ],
+                  [
+                    12.492055892944336,
+                    41.889307577732616
+                  ],
+                  [
+                    12.495832443237305,
+                    41.8896909493925
+                  ],
+                  [
+                    12.495746612548828,
+                    41.89282173182968
+                  ],
+                  [
+                    12.49445915222168,
+                    41.8946745716015
+                  ],
+                  [
+                    12.491540908813477,
+                    41.89288562375104
+                  ]
+                ]
+              ]
+            }
+          }
+        ],
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### color
+
+- **Type**: `string`, `array`
+
+The color either in hexadecimal or as RGB array with red, green, and blue values between 0 and 255 and alpha between 0 and 1 inclusive.
diff --git a/docs/component/func-style.md b/docs/component/func-style.md
new file mode 100644
index 00000000..aa292cda
--- /dev/null
+++ b/docs/component/func-style.md
@@ -0,0 +1,9 @@
+# vl-style-func
+
+## ES6 Module
+
+```javascript
+import { StyleFunc } from 'vuelayers'
+
+Vue.use(StyleFunc)
+```
diff --git a/docs/component/geoloc.md b/docs/component/geoloc.md
index b13a375b..3d8201a5 100644
--- a/docs/component/geoloc.md
+++ b/docs/component/geoloc.md
@@ -6,11 +6,13 @@
 The [Geolocation API](https://www.w3.org/TR/geolocation-API/) is used to locate 
 a user's position. You can place it to the **default slot** of [`vl-map`](/docs/component/map.md) component.
 
-## Versions
+## ES6 Module
 
-`vl-geoloc` is a part of **Geoloc** module:
+```javascript
+import { Geoloc } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/geoloc/
+Vue.use(Geoloc)
+```
 
 ## Usage
 
diff --git a/docs/component/icon-style.md b/docs/component/icon-style.md
new file mode 100644
index 00000000..22fde7e6
--- /dev/null
+++ b/docs/component/icon-style.md
@@ -0,0 +1,9 @@
+# vl-style-icon
+
+## ES6 Module
+
+```javascript
+import { IconStyle } from 'vuelayers'
+
+Vue.use(IconStyle)
+```
diff --git a/docs/component/image-layer.md b/docs/component/image-layer.md
index 41a7024d..d06b7e04 100644
--- a/docs/component/image-layer.md
+++ b/docs/component/image-layer.md
@@ -5,11 +5,13 @@
 `vl-layer-image` components can render any server-rendered image, it is a container for
 raster source, like [`vl-source-image-static`](/docs/component/image-static-source.md).
 
-## Versions
+## ES6 Module
 
-`vl-layer-image` component is a part of **ImageLayer** module:
+```javascript
+import { ImageLayer } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/image-layer/
+Vue.use(ImageLayer)
+```
 
 ## Usage
 
diff --git a/docs/component/image-static-source.md b/docs/component/image-static-source.md
index 6d7559ba..ac2a3b5c 100644
--- a/docs/component/image-static-source.md
+++ b/docs/component/image-static-source.md
@@ -1,3 +1,9 @@
 # vl-image-static-source
 
-// TODO
+## ES6 Module
+
+```javascript
+import { ImageStaticSource } from 'vuelayers'
+
+Vue.use(ImageStaticSource)
+```
diff --git a/docs/component/image-wms-source.md b/docs/component/image-wms-source.md
index 650dfa20..0b0c5a6d 100644
--- a/docs/component/image-wms-source.md
+++ b/docs/component/image-wms-source.md
@@ -1,3 +1,9 @@
 # vl-image-wms-source
 
-// TODO
+## ES6 Module
+
+```javascript
+import { ImageWmsSource } from 'vuelayers'
+
+Vue.use(ImageWmsSource)
+```
diff --git a/docs/component/line-string-geom.md b/docs/component/line-string-geom.md
index ba6b3431..77bcd860 100644
--- a/docs/component/line-string-geom.md
+++ b/docs/component/line-string-geom.md
@@ -1 +1,51 @@
 # vl-geom-line-string
+
+> The single line geometry.
+
+`vl-geom-line-string` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw lines on the map.
+
+## ES6 Module
+
+```javascript
+import { LineStringGeom } from 'vuelayers'
+
+Vue.use(LineStringGeom)
+```
+
+<vuep template="#line-string-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="line-string-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-line-string :coordinates="[[116.544921,40.451633],[116.545264,40.451649],[116.545865,40.451698],[116.546144,40.451551],[116.546337,40.451274],[116.546788,40.451143],[116.547324,40.451078],[116.547539,40.450996],[116.547839,40.450719],[116.548440,40.450506],[116.548933,40.450604],[116.549448,40.450604],[116.550242,40.450376],[116.550865,40.450163],[116.551702,40.449935],[116.552581,40.449576]]"></vl-geom-line-string>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 17,
+        center: [116.54875,40.45064],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[][]`
+
+An array of pairs of coordinates as specified by the [geojson spec](https://tools.ietf.org/html/rfc7946#section-3.1.4) in units of the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/map.md b/docs/component/map.md
index fb0fc8e6..bb4757e7 100644
--- a/docs/component/map.md
+++ b/docs/component/map.md
@@ -2,19 +2,21 @@
 
 > The core component of VueLayers
 
-It is a main container for all other VueLayers components and has one `default` 
+This is the main container for all other VueLayers components and has one `default` 
 slot to place them all. Usually you will use it together with [`vl-view`](/docs/component/view.md) 
 component to setup `zoom`, `center`, `projection` and other view related propeties for the map.
 
-## Module system
+## ES6 Module
 
-`vl-map` component is a part of **Map** module:
+```javascript
+import { Map } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/map/
+Vue.use(Map)
+```
 
 ## Usage
 
-Example of simple map.  
+Example of a simple map.  
 See also documentation of [`vl-view`](/docs/component/view.md) component.
 
 <vuep template="#usage-example"></vuep>
@@ -50,7 +52,7 @@ See also documentation of [`vl-view`](/docs/component/view.md) component.
 - **Type**: `Object, boolean`
 - **Default**: `true`
 
-Options for default controls added to the map by default. Set to `false` to disable 
+Options for default controls are added to the map by default. Set to `false` to disable 
 all map controls. Object value is used to configure controls.
 
 ### keyboard-event-target
@@ -135,7 +137,7 @@ Pointer events that emits [`ol.MapBrowserEvent`](http://openlayers.org/en/latest
 - `pointerdrag`
 - `pointermove` 
 
-Other events that emits [`ol.MapEvent`](http://openlayers.org/en/latest/apidoc/module-ol_MapEvent-MapEvent.html)
+Other events that emit [`ol.MapEvent`](http://openlayers.org/en/latest/apidoc/module-ol_MapEvent-MapEvent.html)
 
 - `movestart`
 - `moveend`
diff --git a/docs/component/modify-interaction.md b/docs/component/modify-interaction.md
index 011c9015..589cb7b6 100644
--- a/docs/component/modify-interaction.md
+++ b/docs/component/modify-interaction.md
@@ -1 +1,9 @@
 # vl-interaction-modify
+
+## ES6 Module
+
+```javascript
+import { ModifyInteraction } from 'vuelayers'
+
+Vue.use(ModifyInteraction)
+```
diff --git a/docs/component/multi-line-string-geom.md b/docs/component/multi-line-string-geom.md
index f86755b4..21b5333b 100644
--- a/docs/component/multi-line-string-geom.md
+++ b/docs/component/multi-line-string-geom.md
@@ -1 +1,51 @@
 # vl-geom-multi-line-string
+
+> The multiple line geometry.
+
+`vl-geom-multi-line-string` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw multiple lines on the map.
+
+## ES6 Module
+
+```javascript
+import { MultiLineStringGeom } from 'vuelayers'
+
+Vue.use(MultiLineStringGeom)
+```
+
+<vuep template="#multi-line-string-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="multi-line-string-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-multi-line-string :coordinates="[[[116.544921,40.451633],[116.545264,40.451649],[116.545865,40.451698],[116.546144,40.451551],[116.546337,40.451274],[116.546788,40.451143],[116.547324,40.451078]],[[116.547839,40.450719],[116.548440,40.450506],[116.548933,40.450604],[116.549448,40.450604],[116.550242,40.450376],[116.550865,40.450163],[116.551702,40.449935],[116.552581,40.449576]]]"></vl-geom-circle>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 17,
+        center: [116.54875,40.45064],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[][][]`
+
+An array of lines, each of which is a [line string](https://tools.ietf.org/html/rfc7946#section-3.1.4) in units of the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/multi-point-geom.md b/docs/component/multi-point-geom.md
index 6345904a..ad548c6d 100644
--- a/docs/component/multi-point-geom.md
+++ b/docs/component/multi-point-geom.md
@@ -1 +1,51 @@
 # vl-geom-multi-point
+
+> A multiple point feature.
+
+`vl-geom-multi-point` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw multiple points at once.
+
+## ES6 Module
+
+```javascript
+import { MultiPointGeom } from 'vuelayers'
+
+Vue.use(MultiPointGeom)
+```
+
+<vuep template="#multi-poing-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="multi-poing-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-multi-point :coordinates="[[116.544921,40.451633],[116.545264,40.451649],[116.545865,40.451698],[116.546144,40.451551],[116.546337,40.451274],[116.546788,40.451143],[116.547324,40.451078],[116.547539,40.450996],[116.547839,40.450719],[116.548440,40.450506],[116.548933,40.450604],[116.549448,40.450604],[116.550242,40.450376],[116.550865,40.450163],[116.551702,40.449935],[116.552581,40.449576]]"></vl-geom-multi-point>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 17,
+        center: [116.54875,40.45064],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[][]`
+
+An array of [points](https://tools.ietf.org/html/rfc7946#section-3.1.2) in units of the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/multi-polygon-geom.md b/docs/component/multi-polygon-geom.md
index 7a078bfe..b9309f61 100644
--- a/docs/component/multi-polygon-geom.md
+++ b/docs/component/multi-polygon-geom.md
@@ -1 +1,51 @@
 # vl-geom-multi-polygon
+
+> The multiple polygon geometry.
+
+`vl-geom-multi-polygon` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw multiple polygons at once on the map.
+
+## ES6 Module
+
+```javascript
+import { MultiPolygonGeom } from 'vuelayers'
+
+Vue.use(MultiPolygonGeom)
+```
+
+<vuep template="#multi-polygon-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="multi-polygon-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-multi-polygon :coordinates="[[[[-98.844959,19.691586],[-98.842749,19.690980],[-98.842170,19.693122],[-98.844358,19.693667],[-98.844959,19.691586]]],[[[-98.847770,19.684212],[-98.849079,19.680596],[-98.845453,19.679585],[-98.844466,19.683384],[-98.847770,19.684212]]]]"></vl-geom-multi-polygon>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [-98.8449,19.6869],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[][][][]`
+
+An array of [polygons](https://geojson.org/geojson-spec.html#polygon) with coordinates in the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/osm-source.md b/docs/component/osm-source.md
index e193f134..d9deb3e3 100644
--- a/docs/component/osm-source.md
+++ b/docs/component/osm-source.md
@@ -1 +1,9 @@
 # vl-source-osm
+
+## ES6 Module
+
+```javascript
+import { OsmSource } from 'vuelayers'
+
+Vue.use(OsmSource)
+```
diff --git a/docs/component/overlay.md b/docs/component/overlay.md
index 9286ede5..10886c96 100644
--- a/docs/component/overlay.md
+++ b/docs/component/overlay.md
@@ -7,11 +7,13 @@ the map. It has **default** scoped slot to render your custom content. You can
 place it any component with slot inside the map components tree to easily bind
 it to some coordinate (for example: inside `vl-feature` or `vl-view`).
 
-## Versions
+## ES6 Module
 
-`vl-overlay` component is a part of **Overlay** module:
+```javascript
+import { Overlay } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/overlay/
+Vue.use(Overlay)
+```
 
 ## Usage
 
diff --git a/docs/component/point-geom.md b/docs/component/point-geom.md
index b7d01de3..c382e8e1 100644
--- a/docs/component/point-geom.md
+++ b/docs/component/point-geom.md
@@ -1 +1,51 @@
 # vl-geom-point
+
+> A single point.
+
+`vl-geom-point` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw a single points.
+
+## ES6 Module
+
+```javascript
+import { PointGeom } from 'vuelayers'
+
+Vue.use(PointGeom)
+```
+
+<vuep template="#point-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="point-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-point :coordinates="[38.726634,9.003391]"></vl-geom-point>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [38.7241,9.0048],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[]`
+
+This point's coordinates in units of the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/polygon-geom.md b/docs/component/polygon-geom.md
index 3469dcb6..78053d9b 100644
--- a/docs/component/polygon-geom.md
+++ b/docs/component/polygon-geom.md
@@ -1 +1,87 @@
 # vl-geom-polygon
+
+> A single polygon geometry.
+
+`vl-geom-polygon` can be used inside a [`vl-feature`](/docs/component/feature.md) to draw a single polygon on the map. The polygon may contain holes in it, check the usage section for more info on this.
+
+## ES6 Module
+
+```javascript
+import { PolygonGeom } from 'vuelayers'
+
+Vue.use(PolygonGeom)
+```
+
+## Usage
+
+A simple polygon.
+
+<vuep template="#polygon-geom-example"></vuep>
+
+<script v-pre type="text/x-template" id="polygon-geom-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-polygon :coordinates="[[[-98.844959,19.691586],[-98.842749,19.690980],[-98.842170,19.693122],[-98.844358,19.693667],[-98.844959,19.691586]]]"></vl-geom-polygon>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [-98.8449,19.6869],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+In the following example there is a polygon with a hole in it.
+
+<vuep template="#polygon-with-hole-example"></vuep>
+
+<script v-pre type="text/x-template" id="polygon-with-hole-example">
+<template>
+  <vl-map data-projection="EPSG:4326" style="height: 400px">
+    <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+    <vl-layer-tile>
+      <vl-source-osm></vl-source-osm>
+    </vl-layer-tile>
+
+    <vl-feature>
+      <vl-geom-polygon :coordinates="[[[-67.489700,-18.379940],[-67.467727,-18.463978],[-67.406616,-18.518678],[-67.318038,-18.568154],[-67.234954,-18.521283],[-67.233581,-18.425547],[-67.313919,-18.366907],[-67.422409,-18.344097],[-67.489700,-18.379940]],[[-67.405242,-18.403397],[-67.341384,-18.406654],[-67.294006,-18.445741],[-67.329025,-18.496540],[-67.379150,-18.470491],[-67.405242,-18.403397]]]"></vl-geom-polygon>
+    </vl-feature>
+  </vl-map>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 11,
+        center: [-67.3675,-18.4601],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### coordinates
+
+- **Type**: `number[][][]`
+
+A [polygon](https://tools.ietf.org/html/rfc7946#section-3.1.6) with coordinates in the map's [`projection`](/docs/quickstart.md#global-data-projection).
diff --git a/docs/component/reg-shape-style.md b/docs/component/reg-shape-style.md
new file mode 100644
index 00000000..5488fbaa
--- /dev/null
+++ b/docs/component/reg-shape-style.md
@@ -0,0 +1,9 @@
+# vl-style-reg-shape
+
+## ES6 Module
+
+```javascript
+import { RegShapeStyle } from 'vuelayers'
+
+Vue.use(RegShapeStyle)
+```
diff --git a/docs/component/select-interaction.md b/docs/component/select-interaction.md
index a9bf578f..fef28a27 100644
--- a/docs/component/select-interaction.md
+++ b/docs/component/select-interaction.md
@@ -1 +1,9 @@
 # vl-interaction-select
+
+## ES6 Module
+
+```javascript
+import { SelectInteraction } from 'vuelayers'
+
+Vue.use(SelectInteraction)
+```
diff --git a/docs/component/snap-interaction.md b/docs/component/snap-interaction.md
index 03da1303..ceeddba1 100644
--- a/docs/component/snap-interaction.md
+++ b/docs/component/snap-interaction.md
@@ -1 +1,9 @@
 # vl-interaction-snap
+
+## ES6 Module
+
+```javascript
+import { SnapInteraction } from 'vuelayers'
+
+Vue.use(SnapInteraction)
+```
diff --git a/docs/component/sputnik-source.md b/docs/component/sputnik-source.md
index 3261e438..8dc6a43b 100644
--- a/docs/component/sputnik-source.md
+++ b/docs/component/sputnik-source.md
@@ -1 +1,9 @@
 # vl-source-sputnik
+
+## ES6 Module
+
+```javascript
+import { SputnikSource } from 'vuelayers'
+
+Vue.use(SputnikSource)
+```
diff --git a/docs/component/stroke-style.md b/docs/component/stroke-style.md
new file mode 100644
index 00000000..93b3556f
--- /dev/null
+++ b/docs/component/stroke-style.md
@@ -0,0 +1,173 @@
+# vl-style-stroke
+
+> Style the stroke of a line or polygon.
+
+Use it inside [`vl-style-box`](/docs/component/style-box.md) to style lines and polygons or inside [`vl-style-circle`](/docs/component/circle-style.md) to style circles.
+
+## ES6 Module
+
+```javascript
+import { StrokeStyle } from 'vuelayers'
+
+Vue.use(StrokeStyle)
+```
+
+## Usage
+
+<vuep template="#stroke-style-example"></vuep>
+
+<script v-pre type="text/x-template" id="stroke-style-example">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-source-vector :features="features"></vl-source-vector>
+
+        <vl-style-box>
+          <vl-style-fill color="white"></vl-style-fill>
+          <vl-style-stroke
+            color="red"
+            :width="3"
+            :line-dash="[3, 5, 30, 5]"
+          ></vl-style-stroke>
+        </vl-style-box>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+        features: [
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ],
+                  [
+                    12.488279342651365,
+                    41.886687809812926
+                  ],
+                  [
+                    12.489266395568846,
+                    41.89032989704626
+                  ],
+                  [
+                    12.485275268554686,
+                    41.89109662579462
+                  ],
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ]
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    12.491540908813477,
+                    41.89288562375104
+                  ],
+                  [
+                    12.492055892944336,
+                    41.889307577732616
+                  ],
+                  [
+                    12.495832443237305,
+                    41.8896909493925
+                  ],
+                  [
+                    12.495746612548828,
+                    41.89282173182968
+                  ],
+                  [
+                    12.49445915222168,
+                    41.8946745716015
+                  ],
+                  [
+                    12.491540908813477,
+                    41.89288562375104
+                  ]
+                ]
+              ]
+            }
+          }
+        ],
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### Color
+
+- **Type**: `array`, `string`
+
+Stroke color. Either in hexadecimal or as RGBA array with red, green, and blue values betweeen 0 and 255 and alpha value between 0 and 1 inclusive.
+
+### lineCap
+
+- **Type**: `string`
+- **Default**: `round`,
+
+How to style the ends of the lines if any. Options are `round`, `butt`, and `square`.
+
+### lineJoin
+
+- **Type**: `string`
+- **Default**: `round`,
+
+How to style line segment joints. Choices are  `round`, `bevel`, `miter`
+
+### lineDash
+
+- **Type**: `array`
+
+An Array of numbers that specify distances to alternately draw a line and a gap.
+
+### lineDashOffset
+
+- **Type**: `number`
+- **Default**: `0`
+
+Offsets the starting point of the dash pattern by the given amount.
+
+### miterLimit
+
+- **Type**: `number`
+- **Default**: `10`
+
+When to cut corners on sharp angles. For reference check [this entry](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/miterLimit) on Mozilla Developer Network.
+
+### Width
+
+- **Type**: `Number`
+- **Default**: `1.25`
+
+Width of the stroke.
diff --git a/docs/component/style-box.md b/docs/component/style-box.md
index 87ae9fd0..f4df35ed 100644
--- a/docs/component/style-box.md
+++ b/docs/component/style-box.md
@@ -1 +1,153 @@
 # vl-style-box
+
+> A container for a collection of styles
+
+Use it inside [`vl-feature`](/docs/component/feature.md) or [`vl-layer-vector`](/docs/component/vector-layer.md) to give custom styles to vector features.
+
+## ES6 Module
+
+```javascript
+import { StyleBox } from 'vuelayers'
+
+Vue.use(StyleBox)
+```
+
+## Usage
+
+Styling a feature.
+
+<vuep template="#circle-style-feature"></vuep>
+
+<script v-pre type="text/x-template" id="circle-style-feature">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-feature>
+          <vl-geom-point
+            :coordinates="[12.492442,41.890170]"
+          ></vl-geom-point>
+
+          <vl-style-box>
+            <vl-style-circle :radius="20">
+              <vl-style-fill color="white"></vl-style-fill>
+              <vl-style-stroke color="red"></vl-style-stroke>
+            </vl-style-circle>
+          </vl-style-box>
+        </vl-feature>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+      }
+    },
+  }
+</script>
+</script>
+
+Styling the whole layer.
+
+<vuep template="#circle-style-layer"></vuep>
+
+<script v-pre type="text/x-template" id="circle-style-layer">
+<template>
+  <div>
+    <vl-map :load-tiles-while-animating="true" :load-tiles-while-interacting="true" data-projection="EPSG:4326" style="height: 400px">
+      <vl-view :zoom.sync="zoom" :center.sync="center" :rotation.sync="rotation"></vl-view>
+
+      <vl-layer-tile>
+        <vl-source-osm></vl-source-osm>
+      </vl-layer-tile>
+
+      <vl-layer-vector>
+        <vl-source-vector :features="features"></vl-source-vector>
+
+        <vl-style-box>
+          <vl-style-fill color="white"></vl-style-fill>
+          <vl-style-stroke color="red"></vl-style-stroke>
+          <vl-style-icon src="/_media/marker.png" :anchor="[.5, 1]" :scale=".3"></vl-style-icon>
+        </vl-style-box>
+      </vl-layer-vector>
+    </vl-map>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        zoom: 15,
+        center: [12.492442,41.890170],
+        rotation: 0,
+        features: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [12.492442,41.890170],
+            },
+            properties: {},
+          },
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ],
+                  [
+                    12.488279342651365,
+                    41.886687809812926
+                  ],
+                  [
+                    12.489266395568846,
+                    41.89032989704626
+                  ],
+                  [
+                    12.485275268554686,
+                    41.89109662579462
+                  ],
+                  [
+                    12.483816146850586,
+                    41.88866861985328
+                  ]
+                ]
+              ]
+            }
+          }
+        ],
+      }
+    },
+  }
+</script>
+</script>
+
+## Properties
+
+### z-index
+
+- **Type**: `number`
+- **Default**: `0`
+
+### condition
+
+- **Type**: `Function | Boolean`
+- **Default**: `true`
diff --git a/docs/component/text-style.md b/docs/component/text-style.md
new file mode 100644
index 00000000..7f1b4514
--- /dev/null
+++ b/docs/component/text-style.md
@@ -0,0 +1,9 @@
+# vl-style-text
+
+## ES6 Module
+
+```javascript
+import { TextStyle } from 'vuelayers'
+
+Vue.use(TextStyle)
+```
diff --git a/docs/component/tile-layer.md b/docs/component/tile-layer.md
index d48b6bd4..015aae2f 100644
--- a/docs/component/tile-layer.md
+++ b/docs/component/tile-layer.md
@@ -6,11 +6,13 @@
 grids organized by zoom levels. It should be used together with tiled source components like
 [`vl-source-xyz`](/docs/component/xyz-source.md), [`vl-source-wmts`](/docs/component/wmts-source.md), [`vl-source-osm`](/docs/component/osm-source.md).
 
-## Versions
+## ES6 Module
 
-`vl-layer-tile` component is a part of **TileLayer** module:
+```javascript
+import { TileLayer } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/tile-layer/
+Vue.use(TileLayer)
+```
 
 ## Usage
 
diff --git a/docs/component/vector-layer.md b/docs/component/vector-layer.md
index 516f3b12..a6a50d30 100644
--- a/docs/component/vector-layer.md
+++ b/docs/component/vector-layer.md
@@ -2,19 +2,21 @@
 
 > Renders vector data
 
-`vl-layer-vector` can render vector from verious backend services. It should be
+`vl-layer-vector` can render vector from various backend services. It should be
 used with together with [`vl-source-vector`](/docs/component/vector-source.md) component.
 
-## Versions
+## ES6 Module
 
-`vl-layer-vector` is a part of **VectorLayer** module:
+```javascript
+import { VectorLayer } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/vector-layer/
+Vue.use(VectorLayer)
+```
 
 ## Usage
 
 Example below shows how you can use `vl-layer-vector` and [`vl-source-vector`](/docs/component/vector-source.md) to render some 
-vector vector features from remote backend.
+vector features from remote backend.
 
 <vuep template="#usage-example"></vuep>
 
diff --git a/docs/component/vector-source.md b/docs/component/vector-source.md
index df723129..c9ea7097 100644
--- a/docs/component/vector-source.md
+++ b/docs/component/vector-source.md
@@ -5,9 +5,13 @@
 `vl-source-vector` can be used together with [`vl-layer-vector`](/docs/component/vector-layer.md) to
 draw any vector data on the map.
 
-# Versions
+## ES6 Module
 
-- **ES6**: https://unpkg.com/vuelayers/lib/vector-source/
+```javascript
+import { VectorSource } from 'vuelayers'
+
+Vue.use(VectorSource)
+```
 
 ## Usage
 
diff --git a/docs/component/vector-tile-layer.md b/docs/component/vector-tile-layer.md
index 366db897..a9af3c93 100644
--- a/docs/component/vector-tile-layer.md
+++ b/docs/component/vector-tile-layer.md
@@ -5,11 +5,13 @@
 `vl-layer-vector-tile` can render tiled vector data in grids organized by zoom levels. It should be used together with 
 [`vl-source-vector-tile`](/docs/component/vector-tile-source.md) component.
 
-## Versions
+## ES6 Module
 
-`vl-layer-vector-tile` component is a part of **VectorTileLayer** module:
+```javascript
+import { VectorTileLayer } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/vector-tile-layer/
+Vue.use(VectorTileLayer)
+```
 
 ## Usage
 
diff --git a/docs/component/vector-tile-source.md b/docs/component/vector-tile-source.md
index 32ba6704..45e721dd 100644
--- a/docs/component/vector-tile-source.md
+++ b/docs/component/vector-tile-source.md
@@ -1 +1,9 @@
 # vl-source-vector-tile
+
+## ES6 Module
+
+```javascript
+import { VectorTileSource } from 'vuelayers'
+
+Vue.use(VectorTileSource)
+```
diff --git a/docs/component/view.md b/docs/component/view.md
index a592d99a..494a9925 100644
--- a/docs/component/view.md
+++ b/docs/component/view.md
@@ -5,11 +5,14 @@
 `vl-view` is the component to act upon to change the **center**, **resolution** 
 and **rotation** of the map.
 
-## Versions
+## ES6 Module
 
-`vl-view` component is a part of **Map** module:
+```javascript
+// vl-view component comes with vl-map
+import { Map } from 'vuelayers'
 
-- **ES6**: https://unpkg.com/vuelayers/lib/map/
+Vue.use(Map)
+```
 
 ## Usage
 
diff --git a/docs/component/wms-source.md b/docs/component/wms-source.md
index b865cf39..8a46da87 100644
--- a/docs/component/wms-source.md
+++ b/docs/component/wms-source.md
@@ -1 +1,18 @@
 # vl-source-wms
+
+## ES6 Module
+
+```javascript
+import { WmsSource } from 'vuelayers'
+
+Vue.use(WmsSource)
+```
+
+## Properties
+
+### extParams
+
+- **Type**: `object`
+- **Example**: `{tiled: true, tilesOrigin: [0, 0]}`
+
+Extra parameters to be passed to the `TileWMS` constructor. Corresponds to [`params`](https://openlayers.org/en/latest/apidoc/module-ol_source_TileWMS.html) except that other properties like `layers` are specified separately.
diff --git a/docs/component/wmts-source.md b/docs/component/wmts-source.md
index 46dd4be8..e7260d39 100644
--- a/docs/component/wmts-source.md
+++ b/docs/component/wmts-source.md
@@ -1 +1,9 @@
 # vl-source-wmts
+
+## ES6 Module
+
+```javascript
+import { WmtsSource } from 'vuelayers'
+
+Vue.use(WmtsSource)
+```
diff --git a/docs/component/xyz-source.md b/docs/component/xyz-source.md
index 0953c550..e7210a93 100644
--- a/docs/component/xyz-source.md
+++ b/docs/component/xyz-source.md
@@ -1 +1,9 @@
 # vl-source-xyz
+
+## ES6 Module
+
+```javascript
+import { XyzSource } from 'vuelayers'
+
+Vue.use(XyzSource)
+```
diff --git a/docs/home.md b/docs/home.md
index aa367f52..e47c6e62 100644
--- a/docs/home.md
+++ b/docs/home.md
@@ -7,10 +7,10 @@
 [![License](https://img.shields.io/github/license/ghettovoice/vuelayers.svg)](https://github.com/ghettovoice/vuelayers/blob/master/LICENSE)
 
 <iframe src="https://ghbtns.com/github-btn.html?user=ghettovoice&amp;repo=vuelayers&amp;type=star&amp;count=true&amp;size=large" 
-    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="130px" height="30px"></iframe>
+    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="140px" height="30px"></iframe>
 
 <iframe src="https://ghbtns.com/github-btn.html?user=ghettovoice&amp;repo=vuelayers&amp;type=fork&amp;count=true&amp;size=large" 
-    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="130px" height="30px"></iframe>
+    frameborder="0" scrolling="0" class="github-button vld-github-btn" width="140px" height="30px"></iframe>
 
 ## Overview
 
diff --git a/docs/index.html b/docs/index.html
index 7a7b0d55..8cb07597 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,7 +22,7 @@
   <link rel="stylesheet" href="//unpkg.com/docsify@4.6.10/lib/themes/vue.css">
 
   <link rel="stylesheet" href="//unpkg.com/vuep@0.8.0/dist/vuep.min.css">
-  <link rel="stylesheet" href="//unpkg.com/vuelayers@0.10.7/lib/style.min.css">
+  <link rel="stylesheet" href="//unpkg.com/vuelayers@latest/lib/style.css">
 
   <style>
     .cover-main pre {
@@ -34,7 +34,7 @@
       padding: 0 1.4rem;
       position: relative;
       word-wrap: normal;
-      ackground-color: #f8f8f8;
+      background-color: #f8f8f8;
       font-family: Roboto Mono,Monaco,courier,monospace;
     }
 
@@ -84,11 +84,11 @@
     Please wait...
   </div>
 
-  <script src="//unpkg.com/openlayers@4.6.5/dist/ol.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v5.3.0/build/ol.js"></script>
   <script src="//unpkg.com/babel-standalone@6.26.0/babel.min.js"></script>
   <script src="//unpkg.com/vue@2.5.16/dist/vue.min.js"></script>
   <script src="//unpkg.com/vuep@0.8.0/dist/vuep.min.js"></script>
-  <script src="//unpkg.com/vuelayers@0.10.7/lib/index.umd.min.js"></script>
+  <script src="//unpkg.com/vuelayers@latest/lib/index.umd.js"></script>
   <script src="//unpkg.com/fakerator@0.3.0/dist/fakerator.js"></script>
 
   <script src="//unpkg.com/docsify-edit-on-github@1.0.1/index.js"></script>
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 2bb6f516..249f71e2 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -1,7 +1,7 @@
 # Quick start
 
-VueLayers distributed as a set of separated components and mixins built as **ES2015** modules.
-For in browser usage there is full standalone **UMD** bundle provided.
+VueLayers is distributed as a set of separated components and mixins built as **ES2015** modules.
+For in-browser usage, there is a full standalone **UMD** bundle provided.
 
 ## Installation
 
@@ -26,13 +26,11 @@ npm install vuelayers@next
 Recommended: [unpkg](https://unpkg.com/)  
 You can browse the source of the npm package at [unpkg.com/vuelayers/](https://unpkg.com/vuelayers/).
 
-!> OpenLayers doesn't included into package, so you should add it yourself  
+!> OpenLayers isn't included in the package, so you should add it yourself.
 
 ```html
 <!-- include Vue -->
 <script src="https://unpkg.com/vue/dist/vue.js"></script>
-<!-- include OpenLayers -->
-<script src="https://unpkg.com/openlayers/dist/ol.js"></script>
 <!-- include UMD VueLayers build -->
 <link rel="stylesheet" href="https://unpkg.com/vuelayers/lib/style.css">
 <script src="https://unpkg.com/vuelayers/lib/index.umd.js"></script>
@@ -42,6 +40,39 @@ You can browse the source of the npm package at [unpkg.com/vuelayers/](https://u
 </script>
 ```
 
+### Nuxt.js
+
+Create a plugin file (ex: `vuelayers.js`) in the `plugins/` directory, with this content
+
+```js
+import Vue from 'vue'
+import VueLayers from 'vuelayers'
+import 'vuelayers/lib/style.css' // needs css-loader
+
+Vue.use(VueLayers)
+```
+
+Create a file in `modules/` or `shared/` directory named `vuelayers.js`
+
+```js
+export default function (moduleOptions) {
+	this.options.css.push('vuelayers/lib/style.css')
+}
+```
+
+Then in the `nuxt.config.js` file, fill in the plugins and modules section properly. Note that `ssr: false` is mandatory if you use universal mode in Nuxt.
+
+```
+plugins: [{
+		src: '@/plugins/vueLayers',
+		ssr: false
+	}, { ... }],
+modules: [
+                ...,
+		'~/shared/vueLayers',
+	],
+```
+
 ### Build from source
 
 !> Node **v6+** is required
@@ -86,12 +117,12 @@ Vue.use(Geoloc)
 
 ### Global data projection
 
-By default all components accepts coordinates in map view projection (**EPSG:3857** by default)
+By default all components accept coordinates in map view projection (**EPSG:3857** by default)
 but you can bind all components to accept and return coordinates in another projection with
 `dataProjection` global option or with [`data-projection`](component/map.md#data-projection) property on the `vl-map` component. 
 
 This rule applies only for plain coordinates, GeoJSON encoded features or 
-geometries. It works only as thin projection transform layer between Vue and OpenLayers therefore
+geometries. It works only as a thin projection transform layer between Vue and OpenLayers therefore
 internally OpenLayers objects would still use current projection of the map view.
 
 ```js
@@ -102,7 +133,7 @@ Vue.use(VueLayers, {
 ```
 
 Now you are ready to build your awesome GIS application. Check the [VueLayers official demo](demo.md) to get 
-more ideas what you can make with VueLayers.
+more ideas on what you can make with VueLayers.
 
 Simple map with OSM layer example (editable)
 
diff --git a/package-lock.json b/package-lock.json
index 720bf20f..c6e758c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vuelayers",
-  "version": "0.11.4",
+  "version": "0.11.5-beta.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -508,31 +508,13 @@
         "regexpu-core": "^4.2.0"
       },
       "dependencies": {
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
         "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
+          "version": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
+          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA=="
         },
         "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
+          "version": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
           "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
           "requires": {
             "jsesc": "~0.5.0"
           }
@@ -763,14 +745,6 @@
         "@babel/helper-replace-supers": "^7.1.0",
         "@babel/helper-split-export-declaration": "^7.0.0",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "11.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
-          "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -802,31 +776,13 @@
         "regexpu-core": "^4.1.3"
       },
       "dependencies": {
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
         "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
+          "version": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
+          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA=="
         },
         "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
+          "version": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
           "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
           "requires": {
             "jsesc": "~0.5.0"
           }
@@ -958,17 +914,6 @@
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.13.3"
-      },
-      "dependencies": {
-        "regenerator-transform": {
-          "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz",
-          "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
-          "dev": true,
-          "requires": {
-            "private": "^0.1.6"
-          }
-        }
       }
     },
     "@babel/plugin-transform-runtime": {
@@ -1058,31 +1003,13 @@
         "regexpu-core": "^4.1.3"
       },
       "dependencies": {
-        "regexpu-core": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
-          "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^7.0.0",
-            "regjsgen": "^0.4.0",
-            "regjsparser": "^0.3.0",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.0.2"
-          }
-        },
         "regjsgen": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
-          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
-          "dev": true
+          "version": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
+          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA=="
         },
         "regjsparser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
+          "version": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
           "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
-          "dev": true,
           "requires": {
             "jsesc": "~0.5.0"
           }
@@ -1160,31 +1087,6 @@
         "invariant": "^2.2.2",
         "js-levenshtein": "^1.1.3",
         "semver": "^5.3.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
       }
     },
     "@babel/runtime": {
@@ -1262,12 +1164,6 @@
             "ms": "^2.1.1"
           }
         },
-        "globals": {
-          "version": "11.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
-          "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -1330,6 +1226,21 @@
       "integrity": "sha512-ZwTHAlC9akprWDinwEPD4kOuwaYZlyMwVJIANsKNC3QVp0AHB04m7RnB4eqeWfgmxw8MGTzS9uMaw93Z3QcZbw==",
       "dev": true
     },
+    "@sinonjs/text-encoding": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "dev": true
+    },
+    "@turf/bbox": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-5.1.5.tgz",
+      "integrity": "sha1-MFHfUUrUxQ9KT5uKLRX9i2hA7aM=",
+      "requires": {
+        "@turf/helpers": "^5.1.5",
+        "@turf/meta": "^5.1.5"
+      }
+    },
     "@turf/boolean-point-in-polygon": {
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-5.1.5.tgz",
@@ -1337,21 +1248,15 @@
       "requires": {
         "@turf/helpers": "^5.1.5",
         "@turf/invariant": "^5.1.5"
-      },
-      "dependencies": {
-        "@turf/helpers": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz",
-          "integrity": "sha1-FTQFInq5M9AEpbuWQantmZ/L4M8="
-        },
-        "@turf/invariant": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz",
-          "integrity": "sha1-8BUP9ykLOFd7c9CIt5MsHuCqkKc=",
-          "requires": {
-            "@turf/helpers": "^5.1.5"
-          }
-        }
+      }
+    },
+    "@turf/center": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@turf/center/-/center-5.1.5.tgz",
+      "integrity": "sha1-RKss2VT2PA03dX9xWKmcPvURS4A=",
+      "requires": {
+        "@turf/bbox": "^5.1.5",
+        "@turf/helpers": "^5.1.5"
       }
     },
     "@turf/clone": {
@@ -1360,13 +1265,45 @@
       "integrity": "sha1-JT6NNUdxgZduM636tQoPAqfw42c=",
       "requires": {
         "@turf/helpers": "^5.1.5"
-      },
-      "dependencies": {
-        "@turf/helpers": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz",
-          "integrity": "sha1-FTQFInq5M9AEpbuWQantmZ/L4M8="
-        }
+      }
+    },
+    "@turf/distance": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-5.1.5.tgz",
+      "integrity": "sha1-Oc8YIEu/h1h9cH5gmmARiQkVZAk=",
+      "requires": {
+        "@turf/helpers": "^5.1.5",
+        "@turf/invariant": "^5.1.5"
+      }
+    },
+    "@turf/explode": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@turf/explode/-/explode-5.1.5.tgz",
+      "integrity": "sha1-sSsvd0AEobSPYrqVsgocZVo94Rg=",
+      "requires": {
+        "@turf/helpers": "^5.1.5",
+        "@turf/meta": "^5.1.5"
+      }
+    },
+    "@turf/helpers": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz",
+      "integrity": "sha1-FTQFInq5M9AEpbuWQantmZ/L4M8="
+    },
+    "@turf/invariant": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz",
+      "integrity": "sha1-8BUP9ykLOFd7c9CIt5MsHuCqkKc=",
+      "requires": {
+        "@turf/helpers": "^5.1.5"
+      }
+    },
+    "@turf/meta": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz",
+      "integrity": "sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=",
+      "requires": {
+        "@turf/helpers": "^5.1.5"
       }
     },
     "@turf/nearest-point": {
@@ -1378,38 +1315,6 @@
         "@turf/distance": "^5.1.5",
         "@turf/helpers": "^5.1.5",
         "@turf/meta": "^5.1.5"
-      },
-      "dependencies": {
-        "@turf/distance": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-5.1.5.tgz",
-          "integrity": "sha1-Oc8YIEu/h1h9cH5gmmARiQkVZAk=",
-          "requires": {
-            "@turf/helpers": "^5.1.5",
-            "@turf/invariant": "^5.1.5"
-          }
-        },
-        "@turf/helpers": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz",
-          "integrity": "sha1-FTQFInq5M9AEpbuWQantmZ/L4M8="
-        },
-        "@turf/invariant": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz",
-          "integrity": "sha1-8BUP9ykLOFd7c9CIt5MsHuCqkKc=",
-          "requires": {
-            "@turf/helpers": "^5.1.5"
-          }
-        },
-        "@turf/meta": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz",
-          "integrity": "sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=",
-          "requires": {
-            "@turf/helpers": "^5.1.5"
-          }
-        }
       }
     },
     "@turf/point-on-feature": {
@@ -1422,48 +1327,6 @@
         "@turf/explode": "^5.1.5",
         "@turf/helpers": "^5.1.5",
         "@turf/nearest-point": "^5.1.5"
-      },
-      "dependencies": {
-        "@turf/bbox": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-5.1.5.tgz",
-          "integrity": "sha1-MFHfUUrUxQ9KT5uKLRX9i2hA7aM=",
-          "requires": {
-            "@turf/helpers": "^5.1.5",
-            "@turf/meta": "^5.1.5"
-          }
-        },
-        "@turf/center": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/center/-/center-5.1.5.tgz",
-          "integrity": "sha1-RKss2VT2PA03dX9xWKmcPvURS4A=",
-          "requires": {
-            "@turf/bbox": "^5.1.5",
-            "@turf/helpers": "^5.1.5"
-          }
-        },
-        "@turf/explode": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/explode/-/explode-5.1.5.tgz",
-          "integrity": "sha1-sSsvd0AEobSPYrqVsgocZVo94Rg=",
-          "requires": {
-            "@turf/helpers": "^5.1.5",
-            "@turf/meta": "^5.1.5"
-          }
-        },
-        "@turf/helpers": {
-          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz",
-          "integrity": "sha1-FTQFInq5M9AEpbuWQantmZ/L4M8="
-        },
-        "@turf/meta": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz",
-          "integrity": "sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=",
-          "requires": {
-            "@turf/helpers": "^5.1.5"
-          }
-        }
       }
     },
     "@types/estree": {
@@ -1472,12 +1335,41 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "10.11.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz",
       "integrity": "sha512-ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==",
       "dev": true
     },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "dev": true
+    },
     "@vue/component-compiler": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler/-/component-compiler-3.6.0.tgz",
@@ -1565,175 +1457,179 @@
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz",
-      "integrity": "sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.7.8",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
-        "@webassemblyjs/wast-parser": "1.7.8"
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz",
-      "integrity": "sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz",
-      "integrity": "sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz",
-      "integrity": "sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz",
-      "integrity": "sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.7.8"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz",
-      "integrity": "sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz",
-      "integrity": "sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==",
-      "dev": true
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz",
-      "integrity": "sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz",
-      "integrity": "sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-buffer": "1.7.8",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
-        "@webassemblyjs/wasm-gen": "1.7.8"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz",
-      "integrity": "sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.8.tgz",
-      "integrity": "sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.1"
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.8.tgz",
-      "integrity": "sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz",
-      "integrity": "sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-buffer": "1.7.8",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
-        "@webassemblyjs/helper-wasm-section": "1.7.8",
-        "@webassemblyjs/wasm-gen": "1.7.8",
-        "@webassemblyjs/wasm-opt": "1.7.8",
-        "@webassemblyjs/wasm-parser": "1.7.8",
-        "@webassemblyjs/wast-printer": "1.7.8"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz",
-      "integrity": "sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
-        "@webassemblyjs/ieee754": "1.7.8",
-        "@webassemblyjs/leb128": "1.7.8",
-        "@webassemblyjs/utf8": "1.7.8"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz",
-      "integrity": "sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-buffer": "1.7.8",
-        "@webassemblyjs/wasm-gen": "1.7.8",
-        "@webassemblyjs/wasm-parser": "1.7.8"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz",
-      "integrity": "sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-api-error": "1.7.8",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.8",
-        "@webassemblyjs/ieee754": "1.7.8",
-        "@webassemblyjs/leb128": "1.7.8",
-        "@webassemblyjs/utf8": "1.7.8"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz",
-      "integrity": "sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/floating-point-hex-parser": "1.7.8",
-        "@webassemblyjs/helper-api-error": "1.7.8",
-        "@webassemblyjs/helper-code-frame": "1.7.8",
-        "@webassemblyjs/helper-fsm": "1.7.8",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz",
-      "integrity": "sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/wast-parser": "1.7.8",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@xtuc/ieee754": {
@@ -1743,16 +1639,15 @@
       "dev": true
     },
     "@xtuc/long": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
-      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "abbrev": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-      "dev": true
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
     },
     "accepts": {
       "version": "1.3.5",
@@ -1788,13 +1683,10 @@
       "dev": true
     },
     "acorn-dynamic-import": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
-      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
     },
     "acorn-jsx": {
       "version": "4.1.1",
@@ -1805,6 +1697,12 @@
         "acorn": "^5.0.3"
       }
     },
+    "acorn-walk": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+      "dev": true
+    },
     "adjust-sourcemap-loader": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
@@ -1858,9 +1756,9 @@
       "dev": true
     },
     "agent-base": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
       "dev": true,
       "requires": {
         "es6-promisify": "^5.0.0"
@@ -1904,18 +1802,6 @@
       "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
       "dev": true
     },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -1991,8 +1877,7 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2015,13 +1900,13 @@
       }
     },
     "anymatch": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "micromatch": "^2.1.5"
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
       }
     },
     "aproba": {
@@ -2115,9 +2000,9 @@
       }
     },
     "arr-flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-      "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-union": {
@@ -2144,12 +2029,6 @@
       "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
       "dev": true
     },
-    "array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
-    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -2183,6 +2062,15 @@
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -2228,12 +2116,12 @@
       "dev": true
     },
     "async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-      "integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.14.0"
+        "lodash": "^4.17.11"
       }
     },
     "async-each": {
@@ -2278,45 +2166,64 @@
         "num2fraction": "^1.2.2",
         "postcss": "^7.0.2",
         "postcss-value-parser": "^3.2.3"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
           "dev": true
         },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-      "dev": true
-    },
     "babel-eslint": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
@@ -2472,8 +2379,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -2567,11 +2473,10 @@
       "dev": true
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2610,9 +2515,9 @@
       "dev": true
     },
     "blob": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
       "dev": true
     },
     "block-stream": {
@@ -2654,27 +2559,6 @@
         "type-is": "~1.6.15"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-          "dev": true
-        },
         "raw-body": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
@@ -2704,9 +2588,9 @@
       },
       "dependencies": {
         "array-flatten": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
-          "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
           "dev": true
         }
       }
@@ -2775,7 +2659,6 @@
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2883,6 +2766,17 @@
         "pako": "~1.0.5"
       }
     },
+    "browserslist": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.2.tgz",
+      "integrity": "sha512-2neU/V0giQy9h3XMPwLhEY3+Ao0uHSwHvU8Q1Ea6AgLVL1sXbX3dzPrJ8NWe5Hi4PoTkCYXOtVR9rfRLI0J/8Q==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000974",
+        "electron-to-chromium": "^1.3.150",
+        "node-releases": "^1.1.23"
+      }
+    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -2961,33 +2855,61 @@
       "dev": true
     },
     "cacache": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
-      "dev": true,
-      "requires": {
-        "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",
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.3",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.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",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+          "dev": true
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
         "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "y18n": {
@@ -2995,6 +2917,12 @@
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
           "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
           "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
         }
       }
     },
@@ -3023,6 +2951,23 @@
         }
       }
     },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+          "dev": true
+        }
+      }
+    },
     "caller-path": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@@ -3088,45 +3033,18 @@
         "caniuse-lite": "^1.0.0",
         "lodash.memoize": "^4.1.2",
         "lodash.uniq": "^4.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          },
-          "dependencies": {
-            "caniuse-lite": {
-              "version": "1.0.30000889",
-              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-              "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-              "dev": true
-            }
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000864",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000864.tgz",
-      "integrity": "sha512-8fuGh8n3MIQ7oBkO/ck7J4LXhV5Sz5aLyFmfpChWpK+rJhqYrOsGDdbBVDdyKIRBWamZpy6iM4OmLCFVudOOhg==",
+      "version": "1.0.30000974",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz",
+      "integrity": "sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==",
       "dev": true
     },
     "capture-stack-trace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
       "dev": true
     },
     "caseless": {
@@ -3135,17 +3053,6 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
     "chai": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
@@ -3252,9 +3159,9 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -3273,21 +3180,6 @@
         "request": "^2.87.0"
       },
       "dependencies": {
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-          "dev": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
         "concat-stream": {
           "version": "1.6.2",
           "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
@@ -3300,21 +3192,6 @@
             "typedarray": "^0.0.6"
           }
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true
-        },
         "extract-zip": {
           "version": "1.6.7",
           "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
@@ -3327,52 +3204,6 @@
             "yauzl": "2.4.1"
           }
         },
-        "form-data": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-          "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
-          },
-          "dependencies": {
-            "combined-stream": {
-              "version": "1.0.6",
-              "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-              "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-              "dev": true,
-              "requires": {
-                "delayed-stream": "~1.0.0"
-              }
-            }
-          }
-        },
-        "har-validator": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
-          "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
-          "dev": true,
-          "requires": {
-            "ajv": "^5.3.0",
-            "har-schema": "^2.0.0"
-          },
-          "dependencies": {
-            "ajv": {
-              "version": "5.5.2",
-              "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-              "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-              "dev": true,
-              "requires": {
-                "co": "^4.6.0",
-                "fast-deep-equal": "^1.0.0",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.3.0"
-              }
-            }
-          }
-        },
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -3388,24 +3219,15 @@
         "mime-db": {
           "version": "1.36.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
-          "dev": true
+          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
         },
         "mime-types": {
-          "version": "2.1.20",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
+          "version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
           "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
-          "dev": true,
           "requires": {
             "mime-db": "~1.36.0"
           }
         },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true
-        },
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -3413,10 +3235,8 @@
           "dev": true
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+          "version": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "readable-stream": {
           "version": "2.3.6",
@@ -3433,34 +3253,6 @@
             "util-deprecate": "~1.0.1"
           }
         },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
-        },
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -3479,9 +3271,9 @@
       }
     },
     "ci-info": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
-      "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
       "dev": true
     },
     "cipher-base": {
@@ -3574,9 +3366,9 @@
       "dev": true
     },
     "clipboard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.0.tgz",
-      "integrity": "sha512-gXzHBlzEVqCk2b8Wpkil89S0WSMAX7eZho2zANX+EEEa9LMutGe9ICU+wHRzsH7cCHaCbUzj900P+AXOM0FE3A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
+      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -3586,24 +3378,14 @@
       }
     },
     "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true,
-          "optional": true
-        }
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
@@ -3657,11 +3439,13 @@
       "dev": true
     },
     "coa": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
-      "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
       "dev": true,
       "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
         "q": "^1.1.2"
       }
     },
@@ -3688,9 +3472,9 @@
       }
     },
     "color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
@@ -3741,19 +3525,10 @@
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
       "dev": true
     },
-    "combine-lists": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.5.0"
-      }
-    },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -3799,46 +3574,37 @@
       }
     },
     "compressible": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-      "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.36.0 < 2"
+        "mime-db": ">= 1.40.0 < 2"
       },
       "dependencies": {
         "mime-db": {
-          "version": "1.36.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
           "dev": true
         }
       }
     },
     "compression": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "~2.0.14",
+        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "on-headers": "~1.0.1",
+        "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -3850,8 +3616,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.0",
@@ -3934,15 +3699,6 @@
         "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "finalhandler": {
           "version": "1.0.6",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
@@ -3967,9 +3723,9 @@
       "dev": true
     },
     "connect-livereload": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.0.tgz",
-      "integrity": "sha1-+fAJh0rWg3GDr7FwtMTjhXodfOs=",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
+      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
       "dev": true
     },
     "console-browserify": {
@@ -4067,17 +3823,17 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz",
-      "integrity": "sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
+        "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
+        "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
       },
       "dependencies": {
@@ -4094,9 +3850,9 @@
       }
     },
     "coveralls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.2.tgz",
-      "integrity": "sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.4.tgz",
+      "integrity": "sha512-eyqUWA/7RT0JagiL0tThVhjbIjoiEUyWCjtUJoOPcWoeofP5WK/jb2OJYoBFrR6DvplR+AxOyuBqk4JHkk5ykA==",
       "dev": true,
       "requires": {
         "growl": "~> 1.10.0",
@@ -4104,88 +3860,14 @@
         "lcov-parse": "^0.0.10",
         "log-driver": "^1.2.7",
         "minimist": "^1.2.0",
-        "request": "^2.85.0"
+        "request": "^2.86.0"
       },
       "dependencies": {
-        "js-yaml": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        },
-        "mime-db": {
-          "version": "1.33.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.18",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-          "dev": true,
-          "requires": {
-            "mime-db": "~1.33.0"
-          }
-        },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "dev": true
-        },
-        "request": {
-          "version": "2.87.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.6.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.1",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.1",
-            "har-validator": "~5.0.3",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.17",
-            "oauth-sign": "~0.8.2",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.1",
-            "safe-buffer": "^5.1.1",
-            "tough-cookie": "~2.3.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.1.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "tough-cookie": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-          "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-          "dev": true,
-          "requires": {
-            "punycode": "^1.4.1"
-          }
         }
       }
     },
@@ -4369,25 +4051,11 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "babel-code-frame": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-          "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
-          "requires": {
-            "chalk": "^1.1.3",
-            "esutils": "^2.0.2",
-            "js-tokens": "^3.0.2"
-          }
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -4412,10 +4080,8 @@
           "dev": true
         },
         "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
+          "version": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
         },
         "postcss": {
           "version": "6.0.23",
@@ -4468,23 +4134,28 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
     "css-select": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.0.tgz",
-      "integrity": "sha512-MGhoq1S9EyPgZIGnts8Yz5WwUOyHmPMdlqeifsYs/xFX7AAm3hY0RJe1dqVlXtYPI66Nsk39R/sa5/ree6L2qg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
+      "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
       "dev": true,
       "requires": {
         "boolbase": "^1.0.0",
-        "css-what": "2.1",
+        "css-what": "^2.1.2",
         "domutils": "^1.7.0",
-        "nth-check": "^1.0.1"
+        "nth-check": "^1.0.2"
       },
       "dependencies": {
+        "css-what": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+          "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+          "dev": true
+        },
         "domutils": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
@@ -4494,13 +4165,22 @@
             "dom-serializer": "0",
             "domelementtype": "1"
           }
+        },
+        "nth-check": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+          "dev": true,
+          "requires": {
+            "boolbase": "~1.0.0"
+          }
         }
       }
     },
     "css-select-base-adapter": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz",
-      "integrity": "sha1-AQKz0UYw34bD65+p9UVicBBs+ZA=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
       "dev": true
     },
     "css-selector-tokenizer": {
@@ -4570,52 +4250,52 @@
       "dev": true
     },
     "cssnano": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.4.tgz",
-      "integrity": "sha512-wP0wbOM9oqsek14CiNRYrK9N3w3jgadtGZKHXysgC/OMVpy0KZgWVPdNqODSZbz7txO9Gekr9taOfcCgL0pOOw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.2",
+        "cssnano-preset-default": "^4.0.7",
         "is-resolvable": "^1.0.0",
         "postcss": "^7.0.0"
       }
     },
     "cssnano-preset-default": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.2.tgz",
-      "integrity": "sha512-zO9PeP84l1E4kbrdyF7NSLtA/JrJY1paX5FHy5+w/ziIXO2kDqDMfJ/mosXkaHHSa3RPiIY3eB6aEgwx3IiGqA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^4.0.1",
         "cssnano-util-raw-cache": "^4.0.1",
         "postcss": "^7.0.0",
-        "postcss-calc": "^6.0.2",
-        "postcss-colormin": "^4.0.2",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
         "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
         "postcss-discard-duplicates": "^4.0.2",
         "postcss-discard-empty": "^4.0.1",
         "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.6",
-        "postcss-merge-rules": "^4.0.2",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
         "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.1",
-        "postcss-minify-params": "^4.0.1",
-        "postcss-minify-selectors": "^4.0.1",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
         "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.1",
-        "postcss-normalize-positions": "^4.0.1",
-        "postcss-normalize-repeat-style": "^4.0.1",
-        "postcss-normalize-string": "^4.0.1",
-        "postcss-normalize-timing-functions": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
         "postcss-normalize-unicode": "^4.0.1",
         "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.1",
-        "postcss-ordered-values": "^4.1.1",
-        "postcss-reduce-initial": "^4.0.2",
-        "postcss-reduce-transforms": "^4.0.1",
-        "postcss-svgo": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
         "postcss-unique-selectors": "^4.0.1"
       }
     },
@@ -4710,14 +4390,6 @@
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "data-uri-to-buffer": {
@@ -4727,9 +4399,9 @@
       "dev": true
     },
     "date-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+      "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
       "dev": true
     },
     "date-now": {
@@ -4760,10 +4432,9 @@
       "integrity": "sha1-JQNfS0UBe9Uae++LO9n2QB3EdCM="
     },
     "debug": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-      "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-      "dev": true,
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
         "ms": "2.0.0"
       }
@@ -4796,9 +4467,9 @@
       "dev": true
     },
     "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true
     },
     "deep-is": {
@@ -4808,29 +4479,48 @@
       "dev": true
     },
     "default-gateway": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
-      "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
+        "execa": "^1.0.0",
         "ip-regex": "^2.1.0"
       },
       "dependencies": {
         "execa": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-          "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
+            "get-stream": "^4.0.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"
           }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
         }
       }
     },
@@ -4988,6 +4678,13 @@
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
       "dev": true
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "dev": true,
+      "optional": true
+    },
     "detect-node": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
@@ -5043,23 +4740,23 @@
       }
     },
     "docsify": {
-      "version": "4.6.10",
-      "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.6.10.tgz",
-      "integrity": "sha512-rLiDkHoepT5PLhO1jeaHIES7S2i/K3r/YhR6Lapipmn5WyU4V0u2LQyCE9M3/g3X7blmkjyXaGHpgXidCZ2tpw==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/docsify/-/docsify-4.9.4.tgz",
+      "integrity": "sha512-Xtm6sfrNU7cqOViWMewDhscn0cySF60q2KTKok9OaPmzt6nRkTAIvYU4dj916IT21o/b336Or3vO2hsvmaQzxg==",
       "dev": true,
       "requires": {
-        "marked": "^0.3.12",
+        "marked": "^0.5.1",
         "medium-zoom": "^0.4.0",
         "opencollective": "^1.0.3",
-        "prismjs": "^1.9.0",
+        "prismjs": "^1.15.0",
         "tinydate": "^1.0.0",
         "tweezer.js": "^1.4.0"
       }
     },
     "docsify-cli": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.2.1.tgz",
-      "integrity": "sha512-0IPCQxLTtkXH4L1L4U+q1c9iUvdHyXST8CBwz0PYnwH4euD2zVI7iNHGXlP2FPAZZn/Lzg9+csVJO8RcxZp41w==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/docsify-cli/-/docsify-cli-4.3.0.tgz",
+      "integrity": "sha512-88O1sMeoZv4lb5GPSJzDtOAv2KzBjpQaSqVlVqY+6hGJfb2wpz9PvlUhvlgPq54zu4kPDeCCyUYgqa/llhKg3w==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -5069,9 +4766,9 @@
         "docsify": ">=3",
         "docsify-server-renderer": ">=4",
         "fs-extra": "^2.1.2",
-        "livereload": "^0.6.2",
+        "livereload": "^0.7.0",
         "lru-cache": "^4.1.1",
-        "open": "^0.0.5",
+        "opn": "^5.3.0",
         "serve-static": "^1.12.1",
         "update-notifier": "^2.1.0",
         "y18n": "^3.2.1",
@@ -5104,17 +4801,6 @@
             "supports-color": "^2.0.0"
           }
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
         "fs-extra": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
@@ -5164,25 +4850,17 @@
       }
     },
     "docsify-server-renderer": {
-      "version": "4.6.10",
-      "resolved": "https://registry.npmjs.org/docsify-server-renderer/-/docsify-server-renderer-4.6.10.tgz",
-      "integrity": "sha512-Zo0JInSLUSWosyugHk8G6ChjIrenbOUE6qAIzzneNuA3svWGXhIf4RJSwdUMdHiUQptRPBB6osZh82LiiPxaMA==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/docsify-server-renderer/-/docsify-server-renderer-4.9.4.tgz",
+      "integrity": "sha512-FnOhGUK4ZqdLBErU87EfMInhDryl4IMlzgP8M3qczC4Yy2DGiktombFTn8JyxnKT25gSgxSgOYyW7Z7iraL/qQ==",
       "dev": true,
       "requires": {
         "debug": "^2.6.8",
+        "docsify": "^4.8.0",
         "node-fetch": "^1.7.0",
         "resolve-pathname": "^2.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "node-fetch": {
           "version": "1.7.3",
           "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -5427,13 +5105,13 @@
       }
     },
     "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "ee-first": {
@@ -5448,6 +5126,12 @@
       "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
       "dev": true
     },
+    "electron-to-chromium": {
+      "version": "1.3.163",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.163.tgz",
+      "integrity": "sha512-uCEoqQeKrjlhUSUudY0XvyNVDhWR5XmnCIV0WXr2Qo9PVzEVXI75LHGtzwro9Qh8NNetRjSitrm8AfQvPGaSqA==",
+      "dev": true
+    },
     "elliptic": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
@@ -5494,15 +5178,14 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
     },
     "engine.io": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz",
-      "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
@@ -5555,15 +5238,15 @@
       }
     },
     "engine.io-parser": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
-      "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
       "dev": true,
       "requires": {
         "after": "0.8.2",
         "arraybuffer.slice": "~0.0.7",
         "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
+        "blob": "0.0.5",
         "has-binary2": "~1.0.2"
       }
     },
@@ -5688,8 +5371,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.10.0",
@@ -5765,18 +5447,6 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
-          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -5803,38 +5473,12 @@
           }
         },
         "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "globals": {
-          "version": "11.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
-          "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
-          "dev": true
-        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
+          "version": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "version": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "ms": {
           "version": "2.1.1",
@@ -5912,15 +5556,6 @@
         "resolve": "^1.5.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "resolve": {
           "version": "1.8.1",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
@@ -5955,15 +5590,6 @@
         "pkg-dir": "^1.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "pkg-dir": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
@@ -6012,15 +5638,6 @@
         "resolve": "^1.6.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "doctrine": {
           "version": "1.5.0",
           "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
@@ -6119,12 +5736,6 @@
         "semver": "^5.5.0"
       },
       "dependencies": {
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
-        },
         "resolve": {
           "version": "1.8.1",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
@@ -6241,18 +5852,18 @@
       "dev": true
     },
     "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
       "dev": true
     },
     "eventsource": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
-      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "requires": {
-        "original": ">=0.0.5"
+        "original": "^1.0.0"
       }
     },
     "eventsource-polyfill": {
@@ -6307,50 +5918,6 @@
         }
       }
     },
-    "expand-braces": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^0.1.0"
-          }
-        },
-        "expand-range": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-          "dev": true,
-          "requires": {
-            "is-number": "^0.1.1",
-            "repeat-string": "^0.2.2"
-          }
-        },
-        "is-number": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-          "dev": true
-        },
-        "repeat-string": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-          "dev": true
-        }
-      }
-    },
     "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
@@ -6407,15 +5974,6 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "depd": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -6468,10 +6026,9 @@
       }
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-      "dev": true
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -6495,9 +6052,9 @@
       }
     },
     "external-editor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
-      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "dev": true,
       "requires": {
         "chardet": "^0.4.0",
@@ -6526,15 +6083,6 @@
         "yauzl": "2.4.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "mkdirp": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
@@ -6561,8 +6109,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -6601,9 +6148,9 @@
       "dev": true
     },
     "figlet": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.2.0.tgz",
-      "integrity": "sha1-bEZTc3j6tkkUa1phQ92gGbQwtBA=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.2.3.tgz",
+      "integrity": "sha512-+F5zdvZ66j77b8x2KCPvWUHC0UCKUMWrewxmewgPlagp3wmDpcrHMbyv/ygq/6xoxBPGQA+UJU3SMoBzKoROQQ==",
       "dev": true
     },
     "figures": {
@@ -6625,6 +6172,31 @@
         "object-assign": "^4.0.1"
       }
     },
+    "file-loader": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.8.5.tgz",
+      "integrity": "sha1-knXQMf54DyfUf19K8CvUNxPMFRs=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "loader-utils": "~0.2.5"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        }
+      }
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -6671,14 +6243,14 @@
       "dev": true
     },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
       "requires": {
         "is-number": "^2.1.0",
         "isobject": "^2.0.0",
-        "randomatic": "^1.1.3",
+        "randomatic": "^3.0.0",
         "repeat-element": "^1.1.2",
         "repeat-string": "^1.5.2"
       }
@@ -6698,15 +6270,6 @@
         "unpipe": "~1.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "encodeurl": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -6785,10 +6348,10 @@
         }
       }
     },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
       "dev": true
     },
     "flush-write-stream": {
@@ -6901,14 +6464,25 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.5",
+        "combined-stream": "1.0.6",
         "mime-types": "^2.1.12"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.6",
+          "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+          "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+          "dev": true,
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        }
       }
     },
     "forwarded": {
@@ -7014,6 +6588,14 @@
         "universalify": "^0.1.0"
       }
     },
+    "fs-minipass": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
+      "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
+      "requires": {
+        "minipass": "^2.2.1"
+      }
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -7029,1208 +6611,441 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.3.0",
-        "node-pre-gyp": "^0.6.39"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "chownr": {
+          "version": "1.1.1",
+          "resolved": false,
+          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
         },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
+        "debug": {
+          "version": "4.1.1",
+          "resolved": false,
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "ms": "^2.1.1"
           }
         },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": false,
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": false,
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
+        "ms": {
+          "version": "2.1.1",
+          "resolved": false,
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": false,
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": false,
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
         },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": false,
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": false,
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
         },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": false,
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "semver": {
+          "version": "5.7.0",
+          "resolved": false,
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
         },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": false,
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "tweetnacl": "^0.14.3"
+            "safe-buffer": "~5.1.0"
           }
         },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "inherits": "~2.0.0"
+        "tar": {
+          "version": "4.4.8",
+          "resolved": false,
+          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
           }
         },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.x.x"
-          }
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": false,
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
+    "ftp": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "geckodriver": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-1.16.2.tgz",
+      "integrity": "sha512-kXZP4QferAv57Ru4Fx2WYuu//ErKJP4hPEkJm4mSETo42jsdYFwdNxwQ4vCGhf14gsCdxU9YrwNupJ8gr1GxPg==",
+      "dev": true,
+      "requires": {
+        "adm-zip": "0.4.11",
+        "bluebird": "3.4.6",
+        "got": "5.6.0",
+        "https-proxy-agent": "2.2.1",
+        "tar": "4.4.2"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.4.6",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz",
+          "integrity": "sha1-AdqNgh2HgT0ViWfnQ9X+bGLPjA8=",
+          "dev": true
         },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
+        "got": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
+          "integrity": "sha1-ux1+4WO3gIK7yOuDbz85UATqb78=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "balanced-match": "^0.4.1",
-            "concat-map": "0.0.1"
+            "create-error-class": "^3.0.1",
+            "duplexer2": "^0.1.4",
+            "is-plain-obj": "^1.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "node-status-codes": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "parse-json": "^2.1.0",
+            "pinkie-promise": "^2.0.0",
+            "read-all-stream": "^3.0.0",
+            "readable-stream": "^2.0.5",
+            "timed-out": "^2.0.0",
+            "unzip-response": "^1.0.0",
+            "url-parse-lax": "^1.0.0"
           }
         },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
         },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
         },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "delayed-stream": "~1.0.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
         },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "boom": "2.x.x"
+            "safe-buffer": "~5.1.0"
           }
         },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
+        "timed-out": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
+          "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=",
+          "dev": true
         },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
+        "unzip-response": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+          "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+          "dev": true
+        }
+      }
+    },
+    "generic-names": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-1.0.3.tgz",
+      "integrity": "sha1-LXhqEhruUIh2eWk56OO/+DbCCRc=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^0.2.16"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
           }
+        }
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-uri": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz",
+      "integrity": "sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==",
+      "dev": true,
+      "requires": {
+        "data-uri-to-buffer": "1",
+        "debug": "2",
+        "extend": "3",
+        "file-uri-to-path": "1",
+        "ftp": "~0.3.10",
+        "readable-stream": "2"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
         },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
+        "isarray": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "^1.0.0",
-            "inherits": "2",
-            "minimatch": "^3.0.0"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
         },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "boom": "2.x.x",
-            "cryptiles": "2.x.x",
-            "hoek": "2.x.x",
-            "sntp": "1.x.x"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
         },
-        "http-signature": {
+        "string_decoder": {
           "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "~0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "mime-db": "1.27.0"
+            "safe-buffer": "~5.1.0"
           }
+        }
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "gh-pages": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-2.0.0.tgz",
+      "integrity": "sha512-zGs6QDPXOpzZRa53s4/ezazHnRLY11RPo6CfbhOyVIl/wdWMZOIuuOhxrUhmVAO8Xdiu2OeGmBPy/+zsUCD/0Q==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.1",
+        "commander": "^2.18.0",
+        "email-addresses": "^3.0.1",
+        "filenamify-url": "^1.0.0",
+        "fs-extra": "^7.0.0",
+        "globby": "^6.1.0",
+        "graceful-fs": "^4.1.11",
+        "rimraf": "^2.6.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.18.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz",
+          "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==",
+          "dev": true
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
+        "rimraf": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.39",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^2.2.1",
-            "tar-pack": "^3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "~0.4.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "buffer-shims": "~1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~1.0.0",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "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.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.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.x.x"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jodid25519": "^1.0.0",
-            "jsbn": "~0.1.0",
-            "tweetnacl": "~0.14.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.2.0",
-            "fstream": "^1.0.10",
-            "fstream-ignore": "^1.0.5",
-            "once": "^1.3.3",
-            "readable-stream": "^2.1.4",
-            "rimraf": "^2.5.1",
-            "tar": "^2.2.1",
-            "uid-number": "^0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "^1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      }
-    },
-    "ftp": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
-    },
-    "geckodriver": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-1.12.2.tgz",
-      "integrity": "sha512-nhTroSDoAjbws1GAALCBFGWcjUI7Uy5nLKJFKmOfOmVGCyn7TazdIYQJFpnre/vtKcieKwXOC8RqBD48g0a/4A==",
-      "dev": true,
-      "requires": {
-        "adm-zip": "0.4.11",
-        "bluebird": "3.4.6",
-        "got": "5.6.0",
-        "https-proxy-agent": "2.2.1",
-        "tar": "4.0.2"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.4.6",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz",
-          "integrity": "sha1-AdqNgh2HgT0ViWfnQ9X+bGLPjA8=",
-          "dev": true
-        }
-      }
-    },
-    "generic-names": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-1.0.3.tgz",
-      "integrity": "sha1-LXhqEhruUIh2eWk56OO/+DbCCRc=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^0.2.16"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        }
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-      "dev": true
-    },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "get-uri": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz",
-      "integrity": "sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==",
-      "dev": true,
-      "requires": {
-        "data-uri-to-buffer": "1",
-        "debug": "2",
-        "extend": "3",
-        "file-uri-to-path": "1",
-        "ftp": "~0.3.10",
-        "readable-stream": "2"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
-      }
-    },
-    "gh-pages": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-2.0.0.tgz",
-      "integrity": "sha512-zGs6QDPXOpzZRa53s4/ezazHnRLY11RPo6CfbhOyVIl/wdWMZOIuuOhxrUhmVAO8Xdiu2OeGmBPy/+zsUCD/0Q==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.1",
-        "commander": "^2.18.0",
-        "email-addresses": "^3.0.1",
-        "filenamify-url": "^1.0.0",
-        "fs-extra": "^7.0.0",
-        "globby": "^6.1.0",
-        "graceful-fs": "^4.1.11",
-        "rimraf": "^2.6.2"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.10"
-          }
-        },
-        "commander": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz",
-          "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.0.5"
           }
         }
       }
@@ -8239,7 +7054,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8283,6 +7097,12 @@
       "integrity": "sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==",
       "dev": true
     },
+    "globals": {
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
+      "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
+      "dev": true
+    },
     "globby": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -8318,77 +7138,22 @@
       }
     },
     "got": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
-      "integrity": "sha1-ux1+4WO3gIK7yOuDbz85UATqb78=",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
-        "create-error-class": "^3.0.1",
-        "duplexer2": "^0.1.4",
-        "is-plain-obj": "^1.0.0",
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
         "is-redirect": "^1.0.0",
         "is-retry-allowed": "^1.0.0",
         "is-stream": "^1.0.0",
         "lowercase-keys": "^1.0.0",
-        "node-status-codes": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "parse-json": "^2.1.0",
-        "pinkie-promise": "^2.0.0",
-        "read-all-stream": "^3.0.0",
-        "readable-stream": "^2.0.5",
-        "timed-out": "^2.0.0",
-        "unzip-response": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
         "url-parse-lax": "^1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "graceful-fs": {
@@ -8416,45 +7181,56 @@
       "dev": true
     },
     "gzip-size": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-      "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
       "dev": true,
       "requires": {
         "duplexer": "^0.1.1",
-        "pify": "^3.0.0"
+        "pify": "^4.0.1"
       },
       "dependencies": {
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
         }
       }
     },
     "handle-thing": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
-      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
       "dev": true
     },
     "handlebars": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
-      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
       "dev": true,
       "requires": {
-        "async": "^1.4.0",
+        "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
-        "source-map": "^0.4.4",
-        "uglify-js": "^2.6"
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+        },
+        "neo-async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+          "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -8466,19 +7242,19 @@
       "dev": true
     },
     "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
+      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
       "dev": true,
       "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^5.3.0",
         "har-schema": "^2.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-          "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "requires": {
             "co": "^4.6.0",
@@ -8486,12 +7262,6 @@
             "fast-json-stable-stringify": "^2.0.0",
             "json-schema-traverse": "^0.3.0"
           }
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-          "dev": true
         }
       }
     },
@@ -8508,7 +7278,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -8625,9 +7394,9 @@
       "dev": true
     },
     "hash.js": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
-      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -8642,16 +7411,6 @@
         }
       }
     },
-    "hasha": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
-      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
-      "dev": true,
-      "requires": {
-        "is-stream": "^1.0.1",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -8764,9 +7523,9 @@
       "dev": true
     },
     "html-comment-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
       "dev": true
     },
     "html-entities": {
@@ -8942,9 +7701,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz",
-      "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=",
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
       "dev": true
     },
     "http-proxy": {
@@ -8958,16 +7717,45 @@
         "requires-port": "^1.0.0"
       }
     },
+    "http-proxy-agent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz",
+      "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=",
+      "dev": true,
+      "requires": {
+        "agent-base": "2",
+        "debug": "2",
+        "extend": "3"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+          "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+          "dev": true,
+          "requires": {
+            "extend": "~3.0.0",
+            "semver": "~5.0.1"
+          }
+        },
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
     "http-proxy-middleware": {
-      "version": "0.18.0",
-      "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.16.2",
+        "http-proxy": "^1.17.0",
         "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
       },
       "dependencies": {
         "arr-diff": {
@@ -8976,12 +7764,6 @@
           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
           "dev": true
         },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-          "dev": true
-        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -9204,9 +7986,9 @@
           "dev": true
         },
         "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.1"
@@ -9295,18 +8077,18 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -9386,6 +8168,22 @@
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
       "dev": true
     },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "ignore-walk": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -9395,6 +8193,33 @@
         "import-from": "^2.1.0"
       }
     },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "caller-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+          "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+          "dev": true,
+          "requires": {
+            "caller-callsite": "^2.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
+      }
+    },
     "import-from": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
@@ -9519,7 +8344,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -9528,8 +8352,7 @@
     "inherits": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
     },
     "ini": {
       "version": "1.3.5",
@@ -9618,13 +8441,21 @@
       }
     },
     "internal-ip": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz",
-      "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
       "dev": true,
       "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+          "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+          "dev": true
+        }
       }
     },
     "interpret": {
@@ -9718,12 +8549,12 @@
       "dev": true
     },
     "is-ci": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
-      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.0.0"
+        "ci-info": "^1.5.0"
       }
     },
     "is-color-stop": {
@@ -10326,12 +9157,6 @@
             "ms": "^2.1.1"
           }
         },
-        "globals": {
-          "version": "11.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
-          "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
-          "dev": true
-        },
         "jsesc": {
           "version": "2.5.1",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
@@ -10383,35 +9208,25 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
-      "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-          "dev": true
-        }
       }
     },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "jsesc": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
@@ -10474,44 +9289,36 @@
         "extsprintf": "1.0.2",
         "json-schema": "0.2.3",
         "verror": "1.3.6"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "just-extend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-3.0.0.tgz",
-      "integrity": "sha512-Fu3T6pKBuxjWT/p4DkqGHFRsysc8OauWr4ZRTY9dIx07Y9O0RkoR5jcv28aeD1vuAwhm3nLkDurwLXoALp4DpQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz",
+      "integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==",
       "dev": true
     },
     "karma": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-3.0.0.tgz",
-      "integrity": "sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.1.0.tgz",
+      "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
         "body-parser": "^1.16.1",
+        "braces": "^2.3.2",
         "chokidar": "^2.0.3",
         "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
         "connect": "^3.6.0",
         "core-js": "^2.2.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
+        "flatted": "^2.0.0",
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "http-proxy": "^1.13.0",
         "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.4",
-        "log4js": "^3.0.0",
+        "lodash": "^4.17.11",
+        "log4js": "^4.0.0",
         "mime": "^2.3.1",
         "minimatch": "^3.0.2",
         "optimist": "^0.6.1",
@@ -10522,7 +9329,7 @@
         "socket.io": "2.1.1",
         "source-map": "^0.6.1",
         "tmp": "0.0.33",
-        "useragent": "2.2.1"
+        "useragent": "2.3.0"
       },
       "dependencies": {
         "anymatch": {
@@ -10533,6 +9340,17 @@
           "requires": {
             "micromatch": "^3.1.4",
             "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
         "arr-diff": {
@@ -10541,12 +9359,6 @@
           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
           "dev": true
         },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-          "dev": true
-        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -10569,739 +9381,159 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
           }
         },
         "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
             "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
+            "inherits": "^2.0.3",
             "is-binary-path": "^1.0.0",
             "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
           }
         },
-        "fsevents": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-          "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
           },
           "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "2.6.9",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "deep-extend": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "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"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.21",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": "^2.1.0"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "debug": "^2.1.2",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.10.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.0",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.1.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.1.10",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
+                "is-descriptor": "^0.1.0"
               }
             },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.7",
-              "bundled": true,
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "deep-extend": "^0.5.1",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
-                  "optional": true
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
                 }
               }
             },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.0.5"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.5.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "ansi-regex": "^2.0.0"
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
               }
             },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.1",
-              "bundled": true,
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
-              "optional": true,
               "requires": {
-                "chownr": "^1.0.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.2.4",
-                "minizlib": "^1.1.0",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.2"
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
               }
             },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.2",
-              "bundled": true,
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "string-width": "^1.0.2"
+                "is-descriptor": "^1.0.0"
               }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
             }
           }
         },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -11323,6 +9555,12 @@
             }
           }
         },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -11330,6 +9568,14 @@
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+              "dev": true
+            }
           }
         },
         "is-data-descriptor": {
@@ -11339,6 +9585,14 @@
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+              "dev": true
+            }
           }
         },
         "is-descriptor": {
@@ -11350,6 +9604,14 @@
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+              "dev": true
+            }
           }
         },
         "is-extglob": {
@@ -11359,9 +9621,9 @@
           "dev": true
         },
         "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.1"
@@ -11374,31 +9636,20 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
           }
         },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -11418,20 +9669,103 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "dev": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+              "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+              "dev": true
+            }
           }
         },
-        "nan": {
-          "version": "2.11.1",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-          "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "dev": true
+            }
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -11498,16 +9832,6 @@
         }
       }
     },
-    "karma-phantomjs-launcher": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
-      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.0.1",
-        "phantomjs-prebuilt": "^2.1.7"
-      }
-    },
     "karma-sinon-chai": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/karma-sinon-chai/-/karma-sinon-chai-2.0.2.tgz",
@@ -11533,23 +9857,80 @@
       }
     },
     "karma-webpack": {
-      "version": "4.0.0-rc.2",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.0-rc.2.tgz",
-      "integrity": "sha512-Wuiq/xFBsbJMsHhYy5SYXxSp7Q0b8uzAG8+Siuo56ntoi5GluPE5LK3Mzl2UtD4k1leFwL6IeIE6Q+tk4F6k9Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.2.tgz",
+      "integrity": "sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==",
       "dev": true,
       "requires": {
-        "async": "^2.0.0",
+        "clone-deep": "^4.0.1",
         "loader-utils": "^1.1.0",
-        "lodash": "^4.17.10",
-        "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^3.2.0"
+        "neo-async": "^2.6.1",
+        "schema-utils": "^1.0.0",
+        "source-map": "^0.7.3",
+        "webpack-dev-middleware": "^3.7.0"
       },
       "dependencies": {
+        "clone-deep": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4",
+            "kind-of": "^6.0.2",
+            "shallow-clone": "^3.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        },
+        "neo-async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+          "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+          "dev": true
+        },
+        "shallow-clone": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.2"
+          }
+        },
         "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
+        },
+        "webpack-dev-middleware": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+          "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+          "dev": true,
+          "requires": {
+            "memory-fs": "^0.4.1",
+            "mime": "^2.4.2",
+            "range-parser": "^1.2.1",
+            "webpack-log": "^2.0.0"
+          }
         }
       }
     },
@@ -11574,15 +9955,6 @@
         "is-buffer": "^1.1.5"
       }
     },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "last-call-webpack-plugin": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
@@ -11602,13 +9974,6 @@
         "package-json": "^4.0.0"
       }
     },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true,
-      "optional": true
-    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -11635,14 +10000,14 @@
       }
     },
     "livereload": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.6.3.tgz",
-      "integrity": "sha512-5SVeqHbKQWB69himud5GNRS8w1RgnMrYBnuIeZMiQ5ZctsIvhFfhKJclihxUS3NkOV7354rnA9rRz1IQBsgaNQ==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.7.0.tgz",
+      "integrity": "sha512-PHnIGczQEvmCctDvRTWylA+1wSwE0/eFm+LkNhlmlAFus/aCRlVE97UOLOf6TUGLmZyfg7z7twG37ZiOgNJAyQ==",
       "dev": true,
       "requires": {
         "chokidar": "^1.7.0",
         "opts": ">= 1.2.0",
-        "ws": "^1.1.1"
+        "ws": "^1.1.5"
       },
       "dependencies": {
         "ultron": {
@@ -11709,9 +10074,9 @@
       }
     },
     "loader-runner": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz",
-      "integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
       "dev": true
     },
     "loader-utils": {
@@ -11744,9 +10109,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lodash._arraycopy": {
@@ -11861,12 +10226,6 @@
         "lodash._isiterateecall": "^3.0.0"
       }
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "lodash.create": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
@@ -11878,12 +10237,6 @@
         "lodash._isiterateecall": "^3.0.0"
       }
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
     "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -11972,9 +10325,9 @@
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
       "dev": true
     },
     "lodash.rest": {
@@ -12023,45 +10376,39 @@
       }
     },
     "log4js": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.5.tgz",
-      "integrity": "sha512-IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.3.1.tgz",
+      "integrity": "sha512-nPGS7w7kBnzNm1j8JycFxwLCbIMae8tHCo0cCdx/khB20Tcod8SZThYEB9E0c27ObcTGA1mlPowaf3hantQ/FA==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
+        "date-format": "^2.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.0",
         "rfdc": "^1.1.2",
-        "streamroller": "0.7.0"
+        "streamroller": "^1.0.5"
       },
       "dependencies": {
-        "circular-json": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.7.tgz",
-          "integrity": "sha512-/pXoV1JA847qRKPrHbBK6YIBGFF8GOP4wzSgUOA7q0ew0vAv0iJswP+2/nZQ9uzA3Azi7eTrg9L2yzXc/7ZMIA==",
-          "dev": true
-        },
         "debug": {
-          "version": "3.2.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
     "loglevel": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
+      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
       "dev": true
     },
     "lolex": {
@@ -12070,13 +10417,6 @@
       "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
       "dev": true
     },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true,
-      "optional": true
-    },
     "loose-envify": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -12103,9 +10443,9 @@
       "dev": true
     },
     "lowercase-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
       "dev": true
     },
     "lru-cache": {
@@ -12144,6 +10484,12 @@
         }
       }
     },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
     "map-age-cleaner": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz",
@@ -12175,9 +10521,15 @@
       }
     },
     "marked": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
-      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.2.tgz",
+      "integrity": "sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==",
+      "dev": true
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
     "md5.js": {
@@ -12409,19 +10761,6 @@
         "loader-utils": "^1.1.0",
         "schema-utils": "^1.0.0",
         "webpack-sources": "^1.1.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "minimalistic-assert": {
@@ -12440,7 +10779,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -12448,14 +10786,12 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "minipass": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
-      "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
-      "dev": true,
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -12464,30 +10800,27 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "yallist": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
         }
       }
     },
     "minizlib": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
-      "dev": true,
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
       "requires": {
         "minipass": "^2.2.1"
       }
     },
     "mississippi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
         "concat-stream": "^1.5.0",
@@ -12496,16 +10829,28 @@
         "flush-write-stream": "^1.0.0",
         "from2": "^2.1.0",
         "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
+        "pump": "^3.0.0",
         "pumpify": "^1.3.3",
         "stream-each": "^1.1.0",
         "through2": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -12545,7 +10890,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -12709,8 +11053,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -12735,11 +11078,10 @@
       "dev": true
     },
     "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-      "dev": true,
-      "optional": true
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -12786,6 +11128,37 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "needle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
+      "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -12799,13 +11172,10 @@
       "dev": true
     },
     "nested-error-stacks": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.0.tgz",
-      "integrity": "sha1-mLL/rvtGEPo5NvHnFDXTBwDeKEA=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
+      "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
+      "dev": true
     },
     "netmask": {
       "version": "1.0.6",
@@ -12847,34 +11217,18 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
           "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-          "dev": true,
           "requires": {
             "extend": "~3.0.0",
             "semver": "~5.0.1"
           }
         },
         "co": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/co/-/co-3.0.6.tgz",
-          "integrity": "sha1-FEXyJsXrlWE45oyawwFn6n0ua9o=",
-          "dev": true
-        },
-        "http-proxy-agent": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz",
-          "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=",
-          "dev": true,
-          "requires": {
-            "agent-base": "2",
-            "debug": "2",
-            "extend": "3"
-          }
+          "version": "https://registry.npmjs.org/co/-/co-3.0.6.tgz",
+          "integrity": "sha1-FEXyJsXrlWE45oyawwFn6n0ua9o="
         },
         "https-proxy-agent": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+          "version": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
           "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-          "dev": true,
           "requires": {
             "agent-base": "2",
             "debug": "2",
@@ -12882,16 +11236,12 @@
           }
         },
         "ip": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
-          "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA=",
-          "dev": true
+          "version": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
+          "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA="
         },
         "lru-cache": {
-          "version": "2.6.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-          "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U=",
-          "dev": true
+          "version": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
+          "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U="
         },
         "minimatch": {
           "version": "3.0.3",
@@ -12902,52 +11252,6 @@
             "brace-expansion": "^1.0.0"
           }
         },
-        "pac-proxy-agent": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
-          "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==",
-          "dev": true,
-          "requires": {
-            "agent-base": "2",
-            "debug": "2",
-            "extend": "3",
-            "get-uri": "2",
-            "http-proxy-agent": "1",
-            "https-proxy-agent": "1",
-            "pac-resolver": "~2.0.0",
-            "raw-body": "2",
-            "socks-proxy-agent": "2"
-          }
-        },
-        "pac-resolver": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz",
-          "integrity": "sha1-mbiNLxk/ve78HJpSnB8yYKtSd80=",
-          "dev": true,
-          "requires": {
-            "co": "~3.0.6",
-            "degenerator": "~1.0.2",
-            "ip": "1.0.1",
-            "netmask": "~1.0.4",
-            "thunkify": "~2.1.1"
-          }
-        },
-        "proxy-agent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz",
-          "integrity": "sha1-V+tTR6qAXXTsaByyVknbo5yTNJk=",
-          "dev": true,
-          "requires": {
-            "agent-base": "2",
-            "debug": "2",
-            "extend": "3",
-            "http-proxy-agent": "1",
-            "https-proxy-agent": "1",
-            "lru-cache": "~2.6.5",
-            "pac-proxy-agent": "1",
-            "socks-proxy-agent": "2"
-          }
-        },
         "q": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
@@ -12957,35 +11261,50 @@
         "semver": {
           "version": "5.0.3",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
-          "dev": true
-        },
-        "socks-proxy-agent": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
-          "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
-          "dev": true,
-          "requires": {
-            "agent-base": "2",
-            "extend": "3",
-            "socks": "~1.1.5"
-          }
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no="
         }
       }
     },
     "nise": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.5.tgz",
-      "integrity": "sha512-OHRVvdxKgwZELf2DTgsJEIA4MOq8XWvpSUzoOXyxJ2mY0mMENWC66+70AShLR2z05B1dzrzWlUQJmJERlOUpZw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz",
+      "integrity": "sha512-Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==",
       "dev": true,
       "requires": {
-        "@sinonjs/formatio": "3.0.0",
-        "just-extend": "^3.0.0",
-        "lolex": "^2.3.2",
-        "path-to-regexp": "^1.7.0",
-        "text-encoding": "^0.6.4"
+        "@sinonjs/formatio": "^3.1.0",
+        "@sinonjs/text-encoding": "^0.7.1",
+        "just-extend": "^4.0.2",
+        "lolex": "^4.1.0",
+        "path-to-regexp": "^1.7.0"
       },
       "dependencies": {
+        "@sinonjs/formatio": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz",
+          "integrity": "sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1",
+            "@sinonjs/samsam": "^3.1.0"
+          }
+        },
+        "@sinonjs/samsam": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz",
+          "integrity": "sha512-wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.0.2",
+            "array-from": "^2.1.1",
+            "lodash": "^4.17.11"
+          }
+        },
+        "lolex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz",
+          "integrity": "sha512-BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==",
+          "dev": true
+        },
         "path-to-regexp": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
@@ -13043,10 +11362,8 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
-          "dev": true,
+          "version": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -13054,138 +11371,45 @@
             "uri-js": "^4.2.2"
           }
         },
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-          "dev": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true
-        },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.22",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-          "dev": true,
-          "requires": {
-            "mime-db": "~1.38.0"
-          }
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true
+          "version": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
+          "version": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "tar": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+          "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
           "dev": true,
           "requires": {
             "block-stream": "*",
-            "fstream": "^1.0.2",
+            "fstream": "^1.0.12",
             "inherits": "2"
           }
         }
       }
     },
     "node-libs-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
       "dev": true,
       "requires": {
         "assert": "^1.1.1",
@@ -13195,10 +11419,10 @@
         "constants-browserify": "^1.0.0",
         "crypto-browserify": "^3.11.0",
         "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
+        "events": "^3.0.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
+        "path-browserify": "0.0.1",
         "process": "^0.11.10",
         "punycode": "^1.2.4",
         "querystring-es3": "^0.2.0",
@@ -13209,8 +11433,8 @@
         "timers-browserify": "^2.0.4",
         "tty-browserify": "0.0.0",
         "url": "^0.11.0",
-        "util": "^0.10.3",
-        "vm-browserify": "0.0.4"
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
         "inherits": {
@@ -13244,6 +11468,17 @@
             "safe-buffer": "~5.1.1",
             "string_decoder": "~1.1.1",
             "util-deprecate": "~1.0.1"
+          },
+          "dependencies": {
+            "string_decoder": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "safe-buffer": {
@@ -13253,13 +11488,22 @@
           "dev": true
         },
         "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+          "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
+        },
+        "util": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
         }
       }
     },
@@ -13292,19 +11536,51 @@
         }
       }
     },
+    "node-pre-gyp": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+      "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "needle": "^2.2.1",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        }
+      }
+    },
     "node-releases": {
-      "version": "1.0.0-alpha.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.12.tgz",
-      "integrity": "sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz",
+      "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
       }
     },
     "node-sass": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -13314,12 +11590,10 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
+        "lodash": "^4.17.11",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
+        "nan": "^2.13.2",
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
@@ -13329,10 +11603,8 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
-          "dev": true,
+          "version": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -13346,12 +11618,6 @@
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true
-        },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -13365,15 +11631,6 @@
             "supports-color": "^2.0.0"
           }
         },
-        "combined-stream": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-          "dev": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
         "cross-spawn": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -13384,111 +11641,27 @@
             "which": "^1.2.9"
           }
         },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true
-        },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.22",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-          "dev": true,
-          "requires": {
-            "mime-db": "~1.38.0"
-          }
-        },
-        "nan": {
-          "version": "2.12.1",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
-          "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true
+          "version": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+          "version": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+        "safe-buffer": {
+          "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "supports-color": {
           "version": "2.0.0",
@@ -13546,6 +11719,24 @@
       "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
       "dev": true
     },
+    "npm-bundled": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+      "dev": true,
+      "optional": true
+    },
+    "npm-packlist": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1"
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -13595,9 +11786,9 @@
       "dev": true
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true
     },
     "object-assign": {
@@ -13707,15 +11898,26 @@
       }
     },
     "object.values": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
-      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.6.1",
-        "function-bind": "^1.1.0",
-        "has": "^1.0.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "dependencies": {
+        "define-properties": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+          "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+          "dev": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        }
       }
     },
     "obuf": {
@@ -13725,9 +11927,9 @@
       "dev": true
     },
     "ol": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ol/-/ol-5.3.1.tgz",
-      "integrity": "sha512-1eCZ/bqqFUqfU2gJl2AWCD6vEpOCohW/OjC4/7lILu7knOfvFAfN2x9I8g0BJfDGYF34XFt1WR62acTfaZ5rUA==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ol/-/ol-5.3.2.tgz",
+      "integrity": "sha512-PfS8Fe1iy4YNJ7P+TvebKME+8gp5NBfQuIldAHfBCkc7agmTezscQrsJWggz5B6Sprm/M/4YBtbyQtw4pIC65w==",
       "requires": {
         "pbf": "3.1.0",
         "pixelworks": "1.1.0",
@@ -13749,16 +11951,15 @@
       }
     },
     "on-headers": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true
     },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -13772,12 +11973,6 @@
         "mimic-fn": "^1.0.0"
       }
     },
-    "open": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
-      "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
-      "dev": true
-    },
     "opencollective": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz",
@@ -13902,9 +12097,9 @@
       "dev": true
     },
     "opn": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-      "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
       "dev": true,
       "requires": {
         "is-wsl": "^1.1.0"
@@ -14013,8 +12208,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
@@ -14028,14 +12222,12 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -14080,61 +12272,110 @@
       "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "requires": {
+        "retry": "^0.12.0"
+      }
+    },
     "p-try": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
       "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
       "dev": true
     },
-    "package-json": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+    "pac-proxy-agent": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
+      "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==",
       "dev": true,
       "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
+        "agent-base": "2",
+        "debug": "2",
+        "extend": "3",
+        "get-uri": "2",
+        "http-proxy-agent": "1",
+        "https-proxy-agent": "1",
+        "pac-resolver": "~2.0.0",
+        "raw-body": "2",
+        "socks-proxy-agent": "2"
       },
       "dependencies": {
-        "got": {
-          "version": "6.7.1",
-          "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-          "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+        "agent-base": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+          "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
           "dev": true,
           "requires": {
-            "create-error-class": "^3.0.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "safe-buffer": "^5.0.1",
-            "timed-out": "^4.0.0",
-            "unzip-response": "^2.0.1",
-            "url-parse-lax": "^1.0.0"
+            "extend": "~3.0.0",
+            "semver": "~5.0.1"
           }
         },
-        "timed-out": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-          "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+        "https-proxy-agent": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+          "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+          "dev": true,
+          "requires": {
+            "agent-base": "2",
+            "debug": "2",
+            "extend": "3"
+          }
+        },
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
+    "pac-resolver": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz",
+      "integrity": "sha1-mbiNLxk/ve78HJpSnB8yYKtSd80=",
+      "dev": true,
+      "requires": {
+        "co": "~3.0.6",
+        "degenerator": "~1.0.2",
+        "ip": "1.0.1",
+        "netmask": "~1.0.4",
+        "thunkify": "~2.1.1"
+      },
+      "dependencies": {
+        "co": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/co/-/co-3.0.6.tgz",
+          "integrity": "sha1-FEXyJsXrlWE45oyawwFn6n0ua9o=",
           "dev": true
         },
-        "unzip-response": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-          "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+        "ip": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
+          "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA=",
           "dev": true
         }
       }
     },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "dev": true,
+      "requires": {
+        "got": "^6.7.1",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
+      }
+    },
     "pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
       "dev": true
     },
     "parallel-transform": {
@@ -14214,16 +12455,25 @@
       "dev": true
     },
     "parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
       "dev": true,
       "requires": {
         "asn1.js": "^4.0.0",
         "browserify-aes": "^1.0.0",
         "create-hash": "^1.1.0",
         "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "parse-color": {
@@ -14286,9 +12536,9 @@
       "dev": true
     },
     "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
       "dev": true
     },
     "path-dirname": {
@@ -14309,8 +12559,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -14387,60 +12636,6 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
-    "phantomjs-prebuilt": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
-      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
-      "dev": true,
-      "requires": {
-        "es6-promise": "^4.0.3",
-        "extract-zip": "^1.6.5",
-        "fs-extra": "^1.0.0",
-        "hasha": "^2.2.0",
-        "kew": "^0.7.0",
-        "progress": "^1.1.8",
-        "request": "^2.81.0",
-        "request-progress": "^2.0.1",
-        "which": "^1.2.10"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-          "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "progress": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-          "dev": true
-        },
-        "request-progress": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
-          "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
-          "dev": true,
-          "requires": {
-            "throttleit": "^1.0.0"
-          }
-        }
-      }
-    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -14494,9 +12689,9 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.17.tgz",
-      "integrity": "sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==",
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
+      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
       "dev": true,
       "requires": {
         "async": "^1.5.2",
@@ -14547,21 +12742,29 @@
       }
     },
     "postcss-calc": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
-      "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz",
+      "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==",
       "dev": true,
       "requires": {
         "css-unit-converter": "^1.1.1",
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^2.2.2",
-        "reduce-css-calc": "^2.0.0"
+        "postcss": "^7.0.5",
+        "postcss-selector-parser": "^5.0.0-rc.4",
+        "postcss-value-parser": "^3.3.1"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-colormin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.2.tgz",
-      "integrity": "sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -14569,31 +12772,6 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
       }
     },
     "postcss-convert-values": {
@@ -14607,9 +12785,9 @@
       }
     },
     "postcss-discard-comments": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz",
-      "integrity": "sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -14700,47 +12878,20 @@
         "schema-utils": "^1.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
-          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
+          "version": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
+          "version": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         }
       }
     },
     "postcss-merge-longhand": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.6.tgz",
-      "integrity": "sha512-JavnI+V4IHWsaUAfOoKeMEiJQGXTraEy1nHM0ILlE6NIQPEZrJDAnPh3lNGZ5HAk2mSSrwp66JoGhvjp6SqShA==",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
       "dev": true,
       "requires": {
         "css-color-names": "0.0.4",
@@ -14750,9 +12901,9 @@
       }
     },
     "postcss-merge-rules": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz",
-      "integrity": "sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -14763,29 +12914,6 @@
         "vendors": "^1.0.0"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        },
         "postcss-selector-parser": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
@@ -14810,9 +12938,9 @@
       }
     },
     "postcss-minify-gradients": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz",
-      "integrity": "sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -14822,9 +12950,9 @@
       }
     },
     "postcss-minify-params": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz",
-      "integrity": "sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -14833,37 +12961,12 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
       }
     },
     "postcss-minify-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz",
-      "integrity": "sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -15086,9 +13189,9 @@
       }
     },
     "postcss-normalize-display-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz",
-      "integrity": "sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -15097,9 +13200,9 @@
       }
     },
     "postcss-normalize-positions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz",
-      "integrity": "sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -15109,9 +13212,9 @@
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz",
-      "integrity": "sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -15121,9 +13224,9 @@
       }
     },
     "postcss-normalize-string": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz",
-      "integrity": "sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
       "dev": true,
       "requires": {
         "has": "^1.0.0",
@@ -15132,9 +13235,9 @@
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz",
-      "integrity": "sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -15143,39 +13246,14 @@
       }
     },
     "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       }
     },
     "postcss-normalize-url": {
@@ -15191,9 +13269,9 @@
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz",
-      "integrity": "sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -15201,9 +13279,9 @@
       }
     },
     "postcss-ordered-values": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz",
-      "integrity": "sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -15212,46 +13290,21 @@
       }
     },
     "postcss-reduce-initial": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz",
-      "integrity": "sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
         "caniuse-api": "^3.0.0",
         "has": "^1.0.0",
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        }
       }
     },
     "postcss-reduce-transforms": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz",
-      "integrity": "sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -15261,20 +13314,28 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
       "dev": true,
       "requires": {
-        "flatten": "^1.0.2",
+        "cssesc": "^2.0.0",
         "indexes-of": "^1.0.1",
         "uniq": "^1.0.1"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+          "dev": true
+        }
       }
     },
     "postcss-svgo": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.1.tgz",
-      "integrity": "sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
       "dev": true,
       "requires": {
         "is-svg": "^3.0.0",
@@ -15335,9 +13396,9 @@
       }
     },
     "prismjs": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.13.0.tgz",
-      "integrity": "sha512-0/1Fiyg3MCzepo6t6Wzx2Ef4nftGKeQIv+Z6LO38RcYJN5QV2ePHh8W41ZkFn57B++6BnglF6fCiJ9b80YlzkQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz",
+      "integrity": "sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA==",
       "dev": true,
       "requires": {
         "clipboard": "^2.0.0"
@@ -15398,6 +13459,57 @@
         "ipaddr.js": "1.6.0"
       }
     },
+    "proxy-agent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz",
+      "integrity": "sha1-V+tTR6qAXXTsaByyVknbo5yTNJk=",
+      "dev": true,
+      "requires": {
+        "agent-base": "2",
+        "debug": "2",
+        "extend": "3",
+        "http-proxy-agent": "1",
+        "https-proxy-agent": "1",
+        "lru-cache": "~2.6.5",
+        "pac-proxy-agent": "1",
+        "socks-proxy-agent": "2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+          "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+          "dev": true,
+          "requires": {
+            "extend": "~3.0.0",
+            "semver": "~5.0.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+          "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+          "dev": true,
+          "requires": {
+            "agent-base": "2",
+            "debug": "2",
+            "extend": "3"
+          }
+        },
+        "lru-cache": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
+          "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
     "proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -15413,8 +13525,7 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
       "version": "1.1.29",
@@ -15480,40 +13591,46 @@
       "dev": true
     },
     "puppeteer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.9.0.tgz",
-      "integrity": "sha512-GH4PmhJf9wBRAPvtJkEJLAvdNNOofZortmBZSj8cGWYni98GUFqsf66blOEfJbo5B8l0KG5HR2d/W2MejnUrzg==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz",
+      "integrity": "sha512-3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
+        "debug": "^4.1.0",
         "extract-zip": "^1.6.6",
         "https-proxy-agent": "^2.2.1",
         "mime": "^2.0.3",
-        "progress": "^2.0.0",
+        "progress": "^2.0.1",
         "proxy-from-env": "^1.0.0",
         "rimraf": "^2.6.1",
-        "ws": "^5.1.1"
+        "ws": "^6.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "progress": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+          "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
           "dev": true
         },
         "ws": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
           "dev": true,
           "requires": {
             "async-limiter": "~1.0.0"
@@ -15562,9 +13679,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
-      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
     "quickselect": {
@@ -15573,50 +13690,34 @@
       "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
     },
     "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
       },
       "dependencies": {
         "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
         },
         "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
         }
       }
     },
     "randombytes": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
@@ -15716,12 +13817,12 @@
       }
     },
     "rc": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
-      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "~0.4.0",
+        "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
@@ -15891,16 +13992,6 @@
         "strip-indent": "^1.0.1"
       }
     },
-    "reduce-css-calc": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.5.tgz",
-      "integrity": "sha512-AybiBU03FKbjYzyvJvwkJZY6NLN+80Ufc2EqEs+41yQH+8wqBEslD6eGiS0oIeq5TNLA5PrhBeYHXWdn8gtW7A==",
-      "dev": true,
-      "requires": {
-        "css-unit-converter": "^1.1.1",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -15922,14 +14013,22 @@
       "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
       "dev": true
     },
+    "regenerator-transform": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz",
+      "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
+      "dev": true,
+      "requires": {
+        "private": "^0.1.6"
+      }
+    },
     "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3",
-        "is-primitive": "^2.0.0"
+        "is-equal-shallow": "^0.1.3"
       }
     },
     "regex-not": {
@@ -15954,10 +14053,41 @@
       "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==",
       "dev": true
     },
+    "regexpu-core": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
+      "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^7.0.0",
+        "regjsgen": "^0.4.0",
+        "regjsparser": "^0.3.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.0.2"
+      },
+      "dependencies": {
+        "regjsgen": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
+          "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA==",
+          "dev": true
+        },
+        "regjsparser": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
+          "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
+          }
+        }
+      }
+    },
     "registry-auth-token": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
       "dev": true,
       "requires": {
         "rc": "^1.1.6",
@@ -15986,14 +14116,6 @@
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
       }
     },
     "relateurl": {
@@ -16107,126 +14229,80 @@
       }
     },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
         "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "hawk": "~6.0.2",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "stringstream": "~0.0.5",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
       },
       "dependencies": {
-        "boom": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-          "dev": true,
-          "requires": {
-            "hoek": "4.x.x"
-          }
-        },
-        "cryptiles": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-          "dev": true,
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "requires": {
-            "boom": "5.x.x"
-          },
-          "dependencies": {
-            "boom": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-              "dev": true,
-              "requires": {
-                "hoek": "4.x.x"
-              }
-            }
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "hawk": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-          "dev": true,
-          "requires": {
-            "boom": "4.x.x",
-            "cryptiles": "3.x.x",
-            "hoek": "4.x.x",
-            "sntp": "2.x.x"
-          }
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
-        "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-          "dev": true
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "mime-db": {
-          "version": "1.30.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
           "dev": true
         },
         "mime-types": {
-          "version": "2.1.17",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "dev": true,
           "requires": {
-            "mime-db": "~1.30.0"
+            "mime-db": "1.40.0"
           }
         },
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
           "dev": true
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
-        },
-        "sntp": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-          "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-          "dev": true,
-          "requires": {
-            "hoek": "4.x.x"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-          "dev": true,
-          "requires": {
-            "punycode": "^1.4.1"
-          }
         }
       }
     },
@@ -16365,6 +14441,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
+    },
     "rework": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
@@ -16390,9 +14472,9 @@
       "dev": true
     },
     "rfdc": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz",
-      "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
       "dev": true
     },
     "rgb-regex": {
@@ -16407,16 +14489,6 @@
       "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
       "dev": true
     },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
     "rimraf": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
@@ -16649,13 +14721,20 @@
       }
     },
     "rollup-pluginutils": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-      "integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz",
+      "integrity": "sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.5.2",
-        "micromatch": "^2.3.11"
+        "estree-walker": "^0.6.1"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+          "dev": true
+        }
       }
     },
     "run-async": {
@@ -16723,22 +14802,11 @@
         "yargs": "^7.0.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
         },
         "yargs": {
           "version": "7.1.0",
@@ -16798,32 +14866,14 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
-      "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
         "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
         "ajv-keywords": "^3.1.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz",
-          "integrity": "sha1-FlCkERTvAFdMrBC4Ay2PTBSBLac=",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
-          "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
-          "dev": true
-        }
       }
     },
     "scss-tokenizer": {
@@ -16856,9 +14906,9 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz",
-      "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
       "dev": true,
       "requires": {
         "node-forge": "0.7.5"
@@ -16900,15 +14950,6 @@
         "statuses": "~1.4.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "depd": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -16956,28 +14997,19 @@
         "parseurl": "~1.3.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "mime-db": {
-          "version": "1.36.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
           "dev": true
         },
         "mime-types": {
-          "version": "2.1.20",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
-          "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "dev": true,
           "requires": {
-            "mime-db": "~1.36.0"
+            "mime-db": "1.40.0"
           }
         }
       }
@@ -17015,9 +15047,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -17396,27 +15428,48 @@
       }
     },
     "sockjs-client": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
-      "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.6",
-        "eventsource": "0.1.6",
-        "faye-websocket": "~0.11.0",
-        "inherits": "^2.0.1",
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
         "json3": "^3.3.2",
-        "url-parse": "^1.1.8"
+        "url-parse": "^1.4.3"
       },
       "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
         "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
           "dev": true,
           "requires": {
             "websocket-driver": ">=0.5.1"
           }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -17430,6 +15483,35 @@
         "smart-buffer": "^1.0.13"
       }
     },
+    "socks-proxy-agent": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
+      "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
+      "dev": true,
+      "requires": {
+        "agent-base": "2",
+        "extend": "3",
+        "socks": "~1.1.5"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+          "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+          "dev": true,
+          "requires": {
+            "extend": "~3.0.0",
+            "semver": "~5.0.1"
+          }
+        },
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -17485,6 +15567,24 @@
         "urix": "^0.1.0"
       }
     },
+    "source-map-support": {
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "source-map-url": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
@@ -17519,52 +15619,56 @@
       "dev": true
     },
     "spdy": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
-      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
         "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
         "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
+        "spdy-transport": "^3.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
     "spdy-transport": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz",
-      "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
         "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "inherits": {
@@ -17573,56 +15677,36 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.1.2",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-              "dev": true
-            }
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
         "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+          "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.1.2",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-              "dev": true
-            }
           }
         }
       }
@@ -17643,9 +15727,9 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -17655,38 +15739,17 @@
         "ecc-jsbn": "~0.1.1",
         "getpass": "^0.1.1",
         "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
-      },
-      "dependencies": {
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-          "dev": true
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "ssri": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
+        "figgy-pudding": "^3.5.1"
       }
     },
     "stable": {
@@ -17782,9 +15845,9 @@
       }
     },
     "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
         "inherits": "~2.0.1",
@@ -17925,79 +15988,43 @@
       "dev": true
     },
     "streamroller": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.5.tgz",
+      "integrity": "sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.11"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
         }
       }
     },
@@ -18051,16 +16078,6 @@
           "dev": true,
           "optional": true
         },
-        "file-loader": {
-          "version": "0.8.5",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.8.5.tgz",
-          "integrity": "sha1-knXQMf54DyfUf19K8CvUNxPMFRs=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "loader-utils": "~0.2.5"
-          }
-        },
         "loader-utils": {
           "version": "0.2.17",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
@@ -18099,20 +16116,13 @@
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
       "dev": true
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -18188,9 +16198,9 @@
       }
     },
     "stylehacks": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.1.tgz",
-      "integrity": "sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -18198,29 +16208,6 @@
         "postcss-selector-parser": "^3.0.0"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.2.tgz",
-          "integrity": "sha512-docXmVcYth9AiW5183dEe2IxnbmpXF4jiM6efGBVRAli/iDSS894Svvjenrv5NPqAJ4dEJULmT4MSvmLG9qoYg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000888",
-            "electron-to-chromium": "^1.3.73",
-            "node-releases": "^1.0.0-alpha.12"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30000889",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000889.tgz",
-          "integrity": "sha512-MFxcQ6x/LEEoaIhO7Zdb7Eg8YyNONN+WBnS5ERJ0li2yRw51+i4xXUNxnLaveTb/4ZoJqsWKEmlomhG2pYzlQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.73",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz",
-          "integrity": "sha512-6PIg7v9zRoVGh6EheRF8h6Plti+3Yo/qtHobS4/Htyt53DNHmKKGFqSae1AIk0k1S4gCQvt7I2WgpbuZNcDY+g==",
-          "dev": true
-        },
         "postcss-selector-parser": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
@@ -18244,37 +16231,25 @@
       }
     },
     "svgo": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz",
-      "integrity": "sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
+      "integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
       "dev": true,
       "requires": {
-        "coa": "~2.0.1",
-        "colors": "~1.1.2",
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
         "css-select": "^2.0.0",
-        "css-select-base-adapter": "~0.1.0",
+        "css-select-base-adapter": "^0.1.1",
         "css-tree": "1.0.0-alpha.28",
         "css-url-regex": "^1.1.0",
-        "csso": "^3.5.0",
-        "js-yaml": "^3.12.0",
+        "csso": "^3.5.1",
+        "js-yaml": "^3.13.1",
         "mkdirp": "~0.5.1",
-        "object.values": "^1.0.4",
+        "object.values": "^1.1.0",
         "sax": "~1.2.4",
-        "stable": "~0.1.6",
+        "stable": "^0.1.8",
         "unquote": "~1.1.1",
         "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "js-yaml": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-          "dev": true,
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        }
       }
     },
     "table": {
@@ -18291,18 +16266,6 @@
         "string-width": "^2.1.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
-          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -18310,10 +16273,8 @@
           "dev": true
         },
         "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
+          "version": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
@@ -18322,10 +16283,8 @@
           "dev": true
         },
         "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "version": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "string-width": {
           "version": "2.1.1",
@@ -18355,22 +16314,30 @@
       "dev": true
     },
     "tar": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz",
-      "integrity": "sha512-4lWN4uAEWzw8aHyBUx9HWXvH3vIFEhOyvN22HfBzWpE07HaTBXM8ttSeCQpswRo5On4q3nmmYmk7Tomn0uhUaw==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
+      "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
       "dev": true,
       "requires": {
         "chownr": "^1.0.1",
-        "minipass": "^2.2.1",
-        "minizlib": "^1.0.4",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.2.4",
+        "minizlib": "^1.1.0",
         "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
         "yallist": "^3.0.2"
       },
       "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
         "yallist": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "dev": true
         }
       }
@@ -18384,6 +16351,204 @@
         "execa": "^0.7.0"
       }
     },
+    "terser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz",
+      "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        },
+        "errno": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+          "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+          "dev": true,
+          "requires": {
+            "prr": "~1.0.1"
+          }
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "prr": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+          "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        },
+        "serialize-javascript": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+          "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+          "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+          "dev": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        }
+      }
+    },
     "test-exclude": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.0.0.tgz",
@@ -18505,24 +16670,12 @@
         }
       }
     },
-    "text-encoding": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
-      "dev": true
-    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "throttleit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-      "dev": true
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -18596,15 +16749,15 @@
       "dev": true
     },
     "thunky": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz",
-      "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
       "dev": true
     },
     "timed-out": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
-      "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
       "dev": true
     },
     "timers-browserify": {
@@ -18623,16 +16776,16 @@
       "dev": true
     },
     "tiny-emitter": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
-      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
       "dev": true,
       "optional": true
     },
     "tinydate": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.0.0.tgz",
-      "integrity": "sha1-IPMXVqE5We+MV+wTO6KbWt4ELKw=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.1.0.tgz",
+      "integrity": "sha512-YF6YTOyBRHX4b3EtEI0W/mROcv82Gt6VccmVuSAkRV3FNORug2457wSGvT2cThbfuctQvVSmC5GobGheScxtIw==",
       "dev": true
     },
     "tmp": {
@@ -18704,6 +16857,12 @@
         }
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
     "toposort": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
@@ -18780,13 +16939,12 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "tweezer.js": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.4.0.tgz",
-      "integrity": "sha1-IG/1aK00zw5WoEMH2Z/8Uhk9UEU=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/tweezer.js/-/tweezer.js-1.5.0.tgz",
+      "integrity": "sha512-aSiJz7rGWNAQq7hjMK9ZYDuEawXupcCWgl3woQQSoDP2Oh8O4srWb/uO1PzzHIsrPEOqrjJ2sUb9FERfzuBabQ==",
       "dev": true
     },
     "type-check": {
@@ -18821,46 +16979,29 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
+      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-          "dev": true,
-          "optional": true
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+          "dev": true
         },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true,
-      "optional": true
-    },
     "uglifyjs-webpack-plugin": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.0.1.tgz",
@@ -18876,52 +17017,14 @@
         "webpack-sources": "^1.1.0",
         "worker-farm": "^1.5.2"
       },
-      "dependencies": {
-        "ajv": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
-          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "cacache": {
-          "version": "11.2.0",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.2.0.tgz",
-          "integrity": "sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chownr": "^1.0.1",
-            "figgy-pudding": "^3.1.0",
-            "glob": "^7.1.2",
-            "graceful-fs": "^4.1.11",
-            "lru-cache": "^4.1.3",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.0",
-            "unique-filename": "^1.1.0",
-            "y18n": "^4.0.0"
-          }
-        },
+      "dependencies": {
         "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
+          "version": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
         },
         "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
+          "version": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "find-cache-dir": {
           "version": "2.0.0",
@@ -18944,10 +17047,8 @@
           }
         },
         "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "version": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "locate-path": {
           "version": "3.0.0",
@@ -18960,33 +17061,13 @@
           }
         },
         "lru-cache": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+          "version": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-          "dev": true,
           "requires": {
             "pseudomap": "^1.0.2",
             "yallist": "^2.1.2"
           }
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "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": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
         "p-limit": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
@@ -19021,65 +17102,29 @@
           }
         },
         "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "version": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
             "once": "^1.3.1"
           }
         },
         "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+          "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
           "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "dev": true,
           "requires": {
             "glob": "^7.0.5"
           }
         },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "uglify-js": {
-          "version": "3.4.9",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.17.1",
-            "source-map": "~0.6.1"
-          }
-        },
         "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-          "dev": true
+          "version": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
         }
       }
     },
@@ -19118,38 +17163,15 @@
       "dev": true
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {
@@ -19165,9 +17187,9 @@
       "dev": true
     },
     "unique-filename": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
-      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
@@ -19262,21 +17284,21 @@
       }
     },
     "unzip-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
       "dev": true
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
       "dev": true
     },
     "update-notifier": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz",
-      "integrity": "sha1-+bTHAPv9TsEsgRWHJYd31WPYyGY=",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
         "boxen": "^1.2.1",
@@ -19301,7 +17323,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       },
@@ -19309,8 +17330,7 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
@@ -19339,12 +17359,12 @@
       }
     },
     "url-parse": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
-      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
+        "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
@@ -19364,21 +17384,13 @@
       "dev": true
     },
     "useragent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
-      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "2.2.x",
+        "lru-cache": "4.1.x",
         "tmp": "0.0.x"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
-          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
-          "dev": true
-        }
       }
     },
     "util": {
@@ -19393,8 +17405,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
       "version": "1.0.0",
@@ -19446,9 +17457,9 @@
       "dev": true
     },
     "vendors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==",
       "dev": true
     },
     "verror": {
@@ -19467,13 +17478,10 @@
       "dev": true
     },
     "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+      "dev": true
     },
     "void-elements": {
       "version": "2.0.1",
@@ -19551,6 +17559,17 @@
           "requires": {
             "micromatch": "^3.1.4",
             "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
         "arr-diff": {
@@ -19559,12 +17578,6 @@
           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
           "dev": true
         },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-          "dev": true
-        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -19601,24 +17614,23 @@
           }
         },
         "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
             "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
+            "inherits": "^2.0.3",
             "is-binary-path": "^1.0.0",
             "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
+            "normalize-path": "^3.0.0",
             "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
           }
         },
         "expand-brackets": {
@@ -19731,612 +17743,486 @@
           "dependencies": {
             "define-property": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-          "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "2.6.9",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "deep-extend": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "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"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.21",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": "^2.1.0"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.2.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "debug": "^2.1.2",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
+                "is-descriptor": "^1.0.0"
               }
             },
-            "node-pre-gyp": {
-              "version": "0.10.0",
-              "bundled": true,
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.0",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.1.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
+                "is-extendable": "^0.1.0"
               }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
+                "is-extendable": "^0.1.0"
               }
-            },
-            "npm-bundled": {
-              "version": "1.0.3",
-              "bundled": true,
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.1.10",
-              "bundled": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
+                "is-buffer": "^1.1.5"
               }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
+            }
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "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.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "webpack": {
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.34.0.tgz",
+      "integrity": "sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+          "dev": true
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
+                "is-extendable": "^0.1.0"
               }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
+            }
+          }
+        },
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "wrappy": "1"
+                "is-descriptor": "^0.1.0"
               }
             },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
+                "is-extendable": "^0.1.0"
               }
             },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.7",
-              "bundled": true,
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "deep-extend": "^0.5.1",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                   "dev": true,
-                  "optional": true
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
                 }
               }
             },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.0.5"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.5.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
               }
             },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
               "dev": true,
-              "optional": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
               }
             },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "ansi-regex": "^2.0.0"
+                "is-descriptor": "^1.0.0"
               }
             },
-            "strip-json-comments": {
+            "extend-shallow": {
               "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.0.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.2.4",
-                "minizlib": "^1.1.0",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.2",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
-              "optional": true,
               "requires": {
-                "string-width": "^1.0.2"
+                "is-extendable": "^0.1.0"
               }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
             }
           }
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
           },
           "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "is-extendable": "^0.1.0"
               }
             }
           }
@@ -20370,21 +18256,6 @@
             "kind-of": "^6.0.2"
           }
         },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -20438,75 +18309,179 @@
             "to-regex": "^3.0.2"
           }
         },
-        "nan": {
-          "version": "2.11.1",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-          "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+        "tapable": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-bundle-analyzer": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
+      "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-walk": "^6.1.1",
+        "bfj": "^6.1.1",
+        "chalk": "^2.4.1",
+        "commander": "^2.18.0",
+        "ejs": "^2.6.1",
+        "express": "^4.16.3",
+        "filesize": "^3.6.1",
+        "gzip-size": "^5.0.0",
+        "lodash": "^4.17.10",
+        "mkdirp": "^0.5.1",
+        "opener": "^1.5.1",
+        "ws": "^6.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+          "dev": true
+        },
+        "ejs": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
+          "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==",
+          "dev": true
+        },
+        "ws": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
         }
       }
     },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+    "webpack-cli": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz",
+      "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "^1.0.0"
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.0",
+        "global-modules-path": "^2.3.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.5.0",
+        "v8-compile-cache": "^2.0.2",
+        "yargs": "^12.0.2"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+    "webpack-dev-middleware": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+      "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
       "dev": true,
       "requires": {
-        "defaults": "^1.0.3"
+        "memory-fs": "~0.4.1",
+        "mime": "^2.3.1",
+        "range-parser": "^1.0.3",
+        "webpack-log": "^2.0.0"
       }
     },
-    "webpack": {
-      "version": "4.20.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.20.2.tgz",
-      "integrity": "sha512-75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==",
+    "webpack-dev-server": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.1.tgz",
+      "integrity": "sha512-GSBjjDMQ+uJI/Rcw/NfXDq5QpfE4HviafCy2SdbJ8Q22MwsnyoHd5TbWRfxgkbklsMx+ZNgWIKK+cB28ynjiDQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.8",
-        "@webassemblyjs/helper-module-context": "1.7.8",
-        "@webassemblyjs/wasm-edit": "1.7.8",
-        "@webassemblyjs/wasm-parser": "1.7.8",
-        "acorn": "^5.6.2",
-        "acorn-dynamic-import": "^3.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "uglifyjs-webpack-plugin": "^1.2.4",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.6",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.2",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.20",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.4",
+        "semver": "^6.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.3.0",
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.0",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.5"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
-          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+        "accepts": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+          "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
         "arr-diff": {
@@ -20515,18 +18490,41 @@
           "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
           "dev": true
         },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-          "dev": true
-        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
           "dev": true
         },
+        "body-parser": {
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+          "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.0",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "on-finished": "~2.3.0",
+            "qs": "6.7.0",
+            "raw-body": "2.4.0",
+            "type-is": "~1.6.17"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
+          }
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -20556,20 +18554,138 @@
             }
           }
         },
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
           "dev": true
         },
-        "eslint-scope": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-          "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "chokidar": {
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "connect-history-api-fallback": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+          "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+          "dev": true
+        },
+        "content-disposition": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+          "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        },
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+              "dev": true
+            }
+          }
+        },
+        "del": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+          "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+          "dev": true,
+          "requires": {
+            "@types/glob": "^7.1.1",
+            "globby": "^6.1.0",
+            "is-path-cwd": "^2.0.0",
+            "is-path-in-cwd": "^2.0.0",
+            "p-map": "^2.0.0",
+            "pify": "^4.0.1",
+            "rimraf": "^2.6.3"
+          }
+        },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
+        "encodeurl": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+          "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+          "dev": true
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.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"
           }
         },
         "expand-brackets": {
@@ -20587,6 +18703,15 @@
             "to-regex": "^3.0.1"
           },
           "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
             "define-property": {
               "version": "0.2.5",
               "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -20664,6 +18789,55 @@
             }
           }
         },
+        "express": {
+          "version": "4.17.1",
+          "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+          "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+          "dev": true,
+          "requires": {
+            "accepts": "~1.3.7",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.19.0",
+            "content-disposition": "0.5.3",
+            "content-type": "~1.0.4",
+            "cookie": "0.4.0",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "finalhandler": "~1.1.2",
+            "fresh": "0.5.2",
+            "merge-descriptors": "1.0.1",
+            "methods": "~1.1.2",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "~2.0.5",
+            "qs": "6.7.0",
+            "range-parser": "~1.2.1",
+            "safe-buffer": "5.1.2",
+            "send": "0.17.1",
+            "serve-static": "1.14.1",
+            "setprototypeof": "1.1.1",
+            "statuses": "~1.5.0",
+            "type-is": "~1.6.18",
+            "utils-merge": "1.0.1",
+            "vary": "~1.1.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
+          }
+        },
         "extglob": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -20700,12 +18874,6 @@
             }
           }
         },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -20729,1191 +18897,619 @@
             }
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
           }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "pump": "^3.0.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
           },
           "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-extglob": "^2.1.0"
               }
             }
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+        "http-errors": {
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
           "dev": true
         },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+        "ipaddr.js": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+          "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "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.2"
+            "kind-of": "^6.0.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "tapable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz",
-          "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==",
-          "dev": true
-        },
-        "uglify-es": {
-          "version": "3.3.9",
-          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
+            "kind-of": "^6.0.0"
           }
         },
-        "uglifyjs-webpack-plugin": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz",
-          "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "cacache": "^10.0.4",
-            "find-cache-dir": "^1.0.0",
-            "schema-utils": "^0.4.5",
-            "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"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
-        }
-      }
-    },
-    "webpack-bundle-analyzer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.2.tgz",
-      "integrity": "sha512-cZG4wSQtKrSpk5RJ33dxiaAyo8bP0V+JvycAyIDFEiDIhw4LHhhVKhn40YT1w6TR9E4scHA00LnIoBtTA13Mow==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.7.3",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.10",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz",
-          "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==",
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
           "dev": true
         },
-        "ejs": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
-          "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "ws": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz",
-          "integrity": "sha512-c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
-    "webpack-cli": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz",
-      "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.0",
-        "global-modules-path": "^2.3.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.1.0",
-        "loader-utils": "^1.1.0",
-        "supports-color": "^5.5.0",
-        "v8-compile-cache": "^2.0.2",
-        "yargs": "^12.0.2"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "is-extglob": "^2.1.1"
           }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-      "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.9.tgz",
-      "integrity": "sha512-fqPkuNalLuc/hRC2QMkVYJkgNmRvxZQo7ykA2e1XRg/tMJm3qY7ZaD6d89/Fqjxtj9bOrn5wZzLD2n84lJdvWg==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.1.5",
-        "spdy": "^3.4.1",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
-        "webpack-dev-middleware": "3.4.0",
-        "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+        "is-path-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
+          "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==",
+          "dev": true
+        },
+        "is-path-in-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+          "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+          "dev": true,
+          "requires": {
+            "is-path-inside": "^2.1.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-          "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
             "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.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",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "to-regex": "^3.0.2"
           }
         },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
+            "mime-db": "1.40.0"
           }
         },
-        "debug": {
-          "version": "3.2.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+          "dev": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-              "dev": true
-            }
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
           "dev": true,
           "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "proxy-addr": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+          "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+          "dev": true,
+          "requires": {
+            "forwarded": "~0.1.2",
+            "ipaddr.js": "1.9.0"
           }
         },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-          "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "2.6.9",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "deep-extend": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "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"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.21",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": "^2.1.0"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "debug": "^2.1.2",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.10.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.0",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.1.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.1.10",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.7",
-              "bundled": true,
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "dev": true
+        },
+        "send": {
+          "version": "0.17.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+          "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
               "dev": true,
-              "optional": true,
               "requires": {
-                "deep-extend": "^0.5.1",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
+                "ms": "2.0.0"
               },
               "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "dev": true,
-                  "optional": true
+                "ms": {
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                  "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                  "dev": true
                 }
               }
             },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.0.5"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.5.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.0.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.2.4",
-                "minizlib": "^1.1.0",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
+            "ms": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+              "dev": true
             }
           }
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "serve-static": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+          "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.17.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           },
           "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "safe-buffer": "~5.1.0"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "has-flag": "^3.0.0"
           }
         },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-          "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+        "type-is": {
+          "version": "1.6.18",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "media-typer": "0.3.0",
+            "mime-types": "~2.1.24"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "webpack-dev-middleware": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+          "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "memory-fs": "^0.4.1",
+            "mime": "^2.4.2",
+            "range-parser": "^1.2.1",
+            "webpack-log": "^2.0.0"
           },
           "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
+            "mime": {
+              "version": "2.4.4",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+              "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+              "dev": true
             }
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
           "dev": true,
           "requires": {
-            "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.2"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
           }
         },
-        "nan": {
-          "version": "2.11.1",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-          "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
-          "dev": true,
-          "optional": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -21979,13 +19575,22 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "websocket-extensions": {
@@ -21994,11 +19599,6 @@
       "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
-    "whatwg-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
-    },
     "which": {
       "version": "1.2.14",
       "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
@@ -22024,9 +19624,9 @@
       }
     },
     "widest-line": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
-      "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "dev": true,
       "requires": {
         "string-width": "^2.1.1"
@@ -22065,13 +19665,6 @@
         }
       }
     },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true,
-      "optional": true
-    },
     "wkt-parser": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.3.tgz",
@@ -22123,8 +19716,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "0.2.1",
@@ -22136,9 +19728,9 @@
       }
     },
     "write-file-atomic": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
@@ -22198,13 +19790,12 @@
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargonaut": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.2.tgz",
-      "integrity": "sha1-7nuJ6YEho/JB+pJqKm4bZkHIGz8=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
+      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.1",
diff --git a/package.json b/package.json
index db87576a..9588ee3e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vuelayers",
   "fullname": "VueLayers",
-  "version": "0.11.4",
+  "version": "0.11.5-beta.9",
   "description": "Web map Vue components with the power of OpenLayers",
   "author": "Vladimir Vershinin <ghettovoice@gmail.com>",
   "main": "./lib/index.js",
@@ -58,8 +58,7 @@
     "ol-tilecache": "^3.0.1",
     "parse-color": "^1.0.0",
     "rxjs": "^6.3.3",
-    "uuid": "^3.3.2",
-    "whatwg-fetch": "^3.0.0"
+    "uuid": "^3.3.2"
   },
   "peerDependencies": {
     "vue": "^2.3.0"
@@ -97,12 +96,12 @@
     "chromedriver": "~2.42.0",
     "clone-regexp": "^2.1.0",
     "connect-history-api-fallback": "^1.5.0",
-    "coveralls": "^3.0.2",
+    "coveralls": "^3.0.4",
     "cross-env": "^5.2.0",
     "cross-spawn": "^6.0.5",
     "css-loader": "^1.0.0",
-    "cssnano": "^4.1.4",
-    "docsify-cli": "^4.2.1",
+    "cssnano": "^4.1.10",
+    "docsify-cli": "^4.3.0",
     "eslint": "^5.6.1",
     "eslint-config-standard": "^12.0.0",
     "eslint-friendly-formatter": "^4.0.1",
@@ -115,22 +114,22 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.16.3",
     "fs-extra": "^7.0.0",
-    "geckodriver": "~1.12.2",
+    "geckodriver": "^1.16.2",
     "gh-pages": "^2.0.0",
     "glob": "^7.1.3",
     "html-webpack-plugin": "^3.2.0",
-    "karma": "^3.0.0",
+    "karma": "^4.1.0",
     "karma-chai": "^0.1.0",
     "karma-chai-dom": "^1.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.2",
     "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.4",
     "karma-sinon-chai": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
-    "karma-webpack": "^4.0.0-rc.2",
+    "karma-webpack": "^4.0.2",
     "loader-utils": "^1.1.0",
+    "lodash": "^4.17.15",
     "magic-string": "^0.25.1",
     "mini-css-extract-plugin": "^0.4.3",
     "mocha": "^5.2.0",
@@ -144,7 +143,7 @@
     "postcss-load-config": "^2.0.0",
     "postcss-loader": "^3.0.0",
     "proj4": "^2.5.0",
-    "puppeteer": "^1.9.0",
+    "puppeteer": "^1.17.0",
     "resolve-url-loader": "^3.0.0",
     "rollup": "^0.66.3",
     "rollup-plugin-babel": "^4.0.3",
@@ -153,7 +152,7 @@
     "rollup-plugin-re": "^1.0.7",
     "rollup-plugin-uglify": "^3.0.0",
     "rollup-plugin-vue": "^4.2.0",
-    "rollup-pluginutils": "^2.3.3",
+    "rollup-pluginutils": "^2.8.1",
     "sass-loader": "^7.1.0",
     "selenium-server": "~3.14.0",
     "sinon": "^6.3.5",
@@ -165,18 +164,18 @@
     "vue-loader": "^15.4.2",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.5.17",
-    "webpack": "^4.20.2",
-    "webpack-bundle-analyzer": "^3.0.2",
+    "webpack": "^4.34.0",
+    "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.1.2",
     "webpack-dev-middleware": "^3.4.0",
-    "webpack-dev-server": "^3.1.9",
+    "webpack-dev-server": "^3.7.1",
     "webpack-hot-middleware": "^2.24.3",
     "webpack-merge": "^4.1.4",
     "webpack-notifier": "^1.6.0",
     "yargs": "^12.0.2"
   },
   "engines": {
-    "node": ">=8.0.0",
+    "node": ">=8.9.0",
     "npm": ">=5.0.0"
   },
   "files": [
diff --git a/src/component/arcgis-rest-source/source.vue b/src/component/arcgis-rest-source/source.vue
index f1f1d5a0..30e8bc91 100644
--- a/src/component/arcgis-rest-source/source.vue
+++ b/src/component/arcgis-rest-source/source.vue
@@ -2,37 +2,32 @@
   import TileArcGISRestSource from 'ol/source/TileArcGISRest'
   import { tileSource, arcgisSource } from '../../mixin'
 
-  const props = {
-    url: {
-      type: String,
-      required: true,
-      validator: value => !!value.length,
-    },
-  }
-
-  const methods = {
-    createSource () {
-      return new TileArcGISRestSource({
-        attributions: this.attributions,
-        cacheSize: this.cacheSize,
-        crossOrigin: this.crossOrigin,
-        params: this.allParams,
-        logo: this.logo,
-        tileGrid: this._tileGrid,
-        projection: this.projection,
-        reprojectionErrorThreshold: this.reprojectionErrorThreshold,
-        tileLoadFunction: this.tileLoadFunction,
-        url: this.urlTmpl,
-        wrapX: this.wrapX,
-        transition: this.transition,
-      })
-    },
-  }
-
   export default {
     name: 'vl-source-arcgis-rest',
     mixins: [tileSource, arcgisSource],
-    props,
-    methods,
+    props: {
+      url: {
+        type: String,
+        required: true,
+        validator: value => !!value.length,
+      },
+    },
+    methods: {
+      createSource () {
+        return new TileArcGISRestSource({
+          attributions: this.attributions,
+          cacheSize: this.cacheSize,
+          crossOrigin: this.crossOrigin,
+          params: this.allParams,
+          tileGrid: this._tileGrid,
+          projection: this.projection,
+          reprojectionErrorThreshold: this.reprojectionErrorThreshold,
+          tileLoadFunction: this.tileLoadFunction,
+          url: this.urlTmpl,
+          wrapX: this.wrapX,
+          transition: this.transition,
+        })
+      },
+    },
   }
 </script>
diff --git a/src/component/bingmaps-source/source.vue b/src/component/bingmaps-source/source.vue
index 9f198442..398937b0 100644
--- a/src/component/bingmaps-source/source.vue
+++ b/src/component/bingmaps-source/source.vue
@@ -1,81 +1,80 @@
 <script>
   import BingMapsSource from 'ol/source/BingMaps'
-  import tileSource from '../../mixin/tile-source'
+  import { tileSource } from '../../mixin'
   import { makeWatchers } from '../../util/vue-helpers'
 
   const BINGMAPS_MAX_ZOOM = 21
   const BINGMAPS_CULTURE = 'en-us'
 
-  const props = {
-    /**
-     * Enables hidpi tiles.
-     * @type {boolean}
-     */
-    hidpi: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * Culture code.
-     * @type {string}
-     */
-    culture: {
-      type: String,
-      default: BINGMAPS_CULTURE,
-    },
-    /**
-     * Bing Maps API key.
-     * @type {string}
-     */
-    apiKey: {
-      type: String,
-      required: true,
-    },
-    /**
-     * Type of imagery.
-     * @type {string}
-     */
-    imagerySet: {
-      type: String,
-      required: true,
-    },
-    maxZoom: {
-      type: Number,
-      default: BINGMAPS_MAX_ZOOM,
-    },
-    url: String,
-  }
-
-  const methods = {
-    /**
-     * @return {BingMaps}
-     * @protected
-     */
-    createSource () {
-      return new BingMapsSource({
-        cacheSize: this.cacheSize,
-        hidpi: this.hidpi,
-        culture: this.culture,
-        key: this.apiKey,
-        imagerySet: this.imagerySet,
-        maxZoom: this.maxZoom,
-        reprojectionErrorThreshold: this.reprojectionErrorThreshold,
-        wrapX: this.wrapX,
-        transition: this.transition,
-        tileLoadFunction: this.tileLoadFunction,
-      })
-    },
-  }
-
-  const watch = makeWatchers(['apiKey', 'imagerySet'], () => function () {
-    this.scheduleRecreate()
-  })
-
   export default {
     name: 'vl-source-bingmaps',
     mixins: [tileSource],
-    props,
-    methods,
-    watch,
+    props: {
+      /**
+       * Enables hidpi tiles.
+       * @type {boolean}
+       */
+      hidpi: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * Culture code.
+       * @type {string}
+       */
+      culture: {
+        type: String,
+        default: BINGMAPS_CULTURE,
+      },
+      /**
+       * Bing Maps API key.
+       * @type {string}
+       */
+      apiKey: {
+        type: String,
+        required: true,
+      },
+      /**
+       * Type of imagery.
+       * @type {string}
+       */
+      imagerySet: {
+        type: String,
+        required: true,
+      },
+      maxZoom: {
+        type: Number,
+        default: BINGMAPS_MAX_ZOOM,
+      },
+      url: String,
+    },
+    methods: {
+      /**
+       * @return {BingMaps}
+       * @protected
+       */
+      createSource () {
+        return new BingMapsSource({
+          cacheSize: this.cacheSize,
+          hidpi: this.hidpi,
+          culture: this.culture,
+          key: this.apiKey,
+          imagerySet: this.imagerySet,
+          maxZoom: this.maxZoom,
+          reprojectionErrorThreshold: this.reprojectionErrorThreshold,
+          wrapX: this.wrapX,
+          transition: this.transition,
+          tileLoadFunction: this.tileLoadFunction,
+        })
+      },
+    },
+    watch: {
+      ...makeWatchers([
+        'apiKey',
+        'imagerySet',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
   }
 </script>
diff --git a/src/component/circle-geom/geom.vue b/src/component/circle-geom/geom.vue
index ef8bc45f..a185b112 100644
--- a/src/component/circle-geom/geom.vue
+++ b/src/component/circle-geom/geom.vue
@@ -1,90 +1,73 @@
 <script>
   import Circle from 'ol/geom/Circle'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { hasGeometry } from '../../util/assert'
   import { constant } from '../../util/minilo'
 
   /**
-   * @vueProps
+   * @alias module:circle-geom/geom
+   * @title vl-geom-circle
+   * @vueProto
    */
-  const props = {
-    coordinates: {
-      type: Array,
-      required: true,
-      validator: value => value.length === 2,
+  export default {
+    name: 'vl-geom-circle',
+    mixins: [geometry],
+    props: {
+      coordinates: {
+        type: Array,
+        required: true,
+        validator: value => value.length === 2,
+      },
+      radius: {
+        type: Number,
+        default: 0,
+      },
     },
-    radius: {
-      type: Number,
-      default: 0,
+    computed: {
+      type: constant(GEOMETRY_TYPE.POINT),
+      /**
+       * @type {Array|undefined}
+       */
+      coordinatesViewProj () {
+        if (this.rev && this.$geometry) {
+          return this.$geometry.getCenter()
+        }
+      },
     },
-  }
+    methods: {
+      /**
+       * @return {Circle}
+       * @protected
+       */
+      createGeometry () {
+        return new Circle(this.toViewProj(this.coordinates), this.radius)
+      },
+      /**
+       * @return {Coordinate}
+       */
+      getCoordinates () {
+        hasGeometry(this)
 
-  /**
-   * @vueComputed
-   */
-  const computed = {
-    type: constant(GEOMETRY_TYPE.POINT),
-    /**
-     * @type {Array|undefined}
-     */
-    coordinatesViewProj () {
-      if (this.rev && this.$geometry) {
-        return this.$geometry.getCenter()
-      }
-    },
-  }
-
-  /**
-   * @vueMethods
-   */
-  const methods = {
-    /**
-     * @return {Circle}
-     * @protected
-     */
-    createGeometry () {
-      return new Circle(this.toViewProj(this.coordinates), this.radius)
-    },
-    /**
-     * @return {Coordinate}
-     */
-    getCoordinates () {
-      hasGeometry(this)
+        return this.toDataProj(this.$geometry.getCenter())
+      },
+      /**
+       * @param {Coordinate} coordinate
+       */
+      setCoordinates (coordinate) {
+        hasGeometry(this)
 
-      return this.toDataProj(this.$geometry.getCenter())
+        this.$geometry.setCenter(this.toViewProj(coordinate))
+      },
     },
-    /**
-     * @param {Coordinate} coordinate
-     */
-    setCoordinates (coordinate) {
-      hasGeometry(this)
+    watch: {
+      radius (value) {
+        if (!this.$geometry) return
 
-      this.$geometry.setCenter(this.toViewProj(coordinate))
+        if (value !== this.$geometry.getRadius()) {
+          this.$geometry.setRadius(value)
+        }
+      },
     },
   }
-
-  const watch = {
-    radius (value) {
-      if (!this.$geometry) return
-
-      if (value !== this.$geometry.getRadius()) {
-        this.$geometry.setRadius(value)
-      }
-    },
-  }
-
-  /**
-   * @alias module:circle-geom/geom
-   * @title vl-geom-circle
-   * @vueProto
-   */
-  export default {
-    name: 'vl-geom-circle',
-    mixins: [geometry],
-    props,
-    computed,
-    methods,
-    watch,
-  }
 </script>
diff --git a/src/component/circle-style/style.vue b/src/component/circle-style/style.vue
index f5fae408..88350f1b 100644
--- a/src/component/circle-style/style.vue
+++ b/src/component/circle-style/style.vue
@@ -1,8 +1,7 @@
 <script>
-  import Vue from 'vue'
   import Circle from 'ol/style/Circle'
-  import imageStyle from '../../mixin/image-style'
-  import withFillStrokeStyle from '../../mixin/with-fill-stroke-style'
+  import Vue from 'vue'
+  import { imageStyle, withFillStrokeStyle } from '../../mixin'
   import { isEqual } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
 
diff --git a/src/component/cluster-source/source.vue b/src/component/cluster-source/source.vue
index ee7129a5..64dabda4 100644
--- a/src/component/cluster-source/source.vue
+++ b/src/component/cluster-source/source.vue
@@ -1,91 +1,106 @@
 <script>
-  import sourceContainer from '../../mixin/source-container'
-  import vectorSource from '../../mixin/vector-source'
-  import { createPointGeom, findPointOnSurface } from '../../ol-ext/geom'
+  import { hasSource } from '../../util/assert'
+  import { makeWatchers } from '../../util/vue-helpers'
+  import { sourceContainer, vectorSource } from '../../mixin'
+  import { createPointGeom, findPointOnSurface } from '../../ol-ext'
+  import { observableFromOlEvent } from '../../rx-ext'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import SourceBuilder from './builder'
 
-  const props = {
-    distance: {
-      type: Number,
-      default: 20,
+  export default {
+    name: 'vl-source-cluster',
+    mixins: [vectorSource, sourceContainer],
+    props: {
+      distance: {
+        type: Number,
+        default: 20,
+      },
+      /**
+       * Geometry function factory
+       * @type {function(): (function(f: ol.Feature): ol.geom.SimpleGeometry|undefined)} geomFuncFactory
+       */
+      geomFuncFactory: {
+        type: Function,
+        default: defaultGeomFuncFactory,
+      },
     },
-    /**
-     * Geometry function factory
-     * @type {function(): (function(f: ol.Feature): ol.geom.SimpleGeometry|undefined)} geomFuncFactory
-     */
-    geomFuncFactory: {
-      type: Function,
-      default: defaultGeomFuncFactory,
+    computed: {
+      geomFunc () {
+        return this.geomFuncFactory()
+      },
     },
-  }
+    methods: {
+      /**
+       * @return {Promise<ol.source.Cluster>}
+       * @protected
+       */
+      createSource () {
+        // partial setup of ol.source.Cluster with the help of SourceBuilder class
+        /**
+         * @type {SourceBuilder}
+         * @private
+         */
+        this._sourceBuilder
+          .setAttributions(this.attributions)
+          .setDistance(this.distance)
+          .setGeometryFunction(this.geomFunc)
+          .setLogo(this.logo)
+          .setProjection(this.projection)
+          .setWrapX(this.wrapX)
 
-  const computed = {
-    geomFunc () {
-      return this.geomFuncFactory()
+        return this._sourceBuilder.promise()
+      },
+      /**
+       * @return {Object}
+       * @protected
+       */
+      getServices () {
+        return mergeDescriptors(
+          this::vectorSource.methods.getServices(),
+          this::sourceContainer.methods.getServices(),
+        )
+      },
+      /**
+       * @return {{
+       *     setSource: function(ol.source.Source): void,
+       *     getSource: function(): ol.source.Source
+       *   }|undefined}
+       * @protected
+       */
+      getSourceTarget () {
+        return this._sourceBuilder
+      },
+      subscribeAll () {
+        this::vectorSource.methods.subscribeAll()
+        this::subscribeToSourceChanges()
+      },
     },
-  }
-
-  const methods = {
-    /**
-     * @return {Promise<ol.source.Cluster>}
-     * @protected
-     */
-    createSource () {
-      // partial setup of ol.source.Cluster with the help of SourceBuilder class
+    watch: {
+      distance (value) {
+        if (this.$source && value !== this.$source.getDistance()) {
+          this.$source.setDistance(value)
+        }
+      },
+      ...makeWatchers(['geomFunc'], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
+    created () {
       /**
        * @type {SourceBuilder}
        * @private
        */
       this._sourceBuilder = new SourceBuilder()
-        .setAttributions(this.attributions)
-        .setDistance(this.distance)
-        .setGeometryFunction(this.geomFunc)
-        .setLogo(this.logo)
-        .setProjection(this.projection)
-        .setWrapX(this.wrapX)
 
-      return this._sourceBuilder.promise()
-    },
-    /**
-     * @return {Object}
-     * @protected
-     */
-    getServices () {
-      return mergeDescriptors(
-        this::vectorSource.methods.getServices(),
-        this::sourceContainer.methods.getServices(),
-      )
-    },
-    /**
-     * @return {{
-     *     setSource: function(ol.source.Source): void,
-     *     getSource: function(): ol.source.Source
-     *   }|undefined}
-     * @protected
-     */
-    getSourceTarget () {
-      return this._sourceBuilder
-    },
-  }
-
-  const watch = {
-    distance (value) {
-      if (this.$source && value !== this.$source.getDistance()) {
-        this.$source.setDistance(value)
-      }
+      Object.defineProperties(this, {
+        $innerSource: {
+          enumerable: true,
+          get: this.getSource,
+        },
+      })
     },
   }
 
-  export default {
-    name: 'vl-source-cluster',
-    mixins: [vectorSource, sourceContainer],
-    props,
-    computed,
-    methods,
-    watch,
-  }
-
   /**
    * @returns {function(f: ol.Feature): ol.geom.SimpleGeometry|undefined}
    */
@@ -100,4 +115,18 @@
       }
     }
   }
+
+  function subscribeToSourceChanges () {
+    hasSource(this)
+
+    const adds = observableFromOlEvent(this.$source, 'addfeature')
+    this.subscribeTo(adds, ({ feature }) => {
+      this.addFeature(feature)
+    })
+
+    const removes = observableFromOlEvent(this.$source, 'removefeature')
+    this.subscribeTo(removes, ({ feature }) => {
+      this.removeFeature(feature)
+    })
+  }
 </script>
diff --git a/src/component/draw-interaction/interaction.vue b/src/component/draw-interaction/interaction.vue
index f24d38dd..08938859 100644
--- a/src/component/draw-interaction/interaction.vue
+++ b/src/component/draw-interaction/interaction.vue
@@ -3,238 +3,22 @@
   import DrawInteraction from 'ol/interaction/Draw'
   import { merge as mergeObs } from 'rxjs/observable'
   import { map as mapObs } from 'rxjs/operators'
-  import interaction from '../../mixin/interaction'
-  import stylesContainer from '../../mixin/styles-container'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
-  import { initFeature } from '../../ol-ext/feature'
-  import { createStyle, defaultEditStyle } from '../../ol-ext/style'
-  import { isCollection, isVectorSource } from '../../ol-ext/util'
-  import observableFromOlEvent from '../../rx-ext/from-ol-event'
-  import { hasInteraction } from '../../util/assert'
-  import { camelCase, isFunction, mapValues, upperFirst } from '../../util/minilo'
+  import { interaction, stylesContainer } from '../../mixin'
+  import {
+    createStyle,
+    defaultEditStyle,
+    GEOMETRY_TYPE,
+    initializeFeature,
+    isCollection,
+    isVectorSource,
+  } from '../../ol-ext'
+  import { observableFromOlEvent } from '../../rx-ext'
+  import { assert, hasInteraction } from '../../util/assert'
+  import { camelCase, mapValues, upperFirst } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import { makeWatchers } from '../../util/vue-helpers'
 
   const transformType = type => upperFirst(camelCase(type))
-  /**
-   * @vueProps
-   */
-  const props = {
-    /**
-     * Target source or collection identifier from IdentityMap.
-     * @type {String}
-     */
-    source: {
-      type: String,
-      required: true,
-    },
-    /**
-     * The maximum distance in pixels between "down" and "up" for a "up" event to be considered a "click" event and
-     * actually add a point/vertex to the geometry being drawn. Default is 6 pixels. That value was chosen for the
-     * draw interaction to behave correctly on mouse as well as on touch devices.
-     * @type {number}
-     */
-    clickTolerance: {
-      type: Number,
-      default: 6,
-    },
-    /**
-     * Pixel distance for snapping to the drawing finish.
-     * @type {number}
-     */
-    snapTolerance: {
-      type: Number,
-      default: 12,
-    },
-    /**
-     * Drawing type ('Point', 'LineString', 'Polygon', 'MultiPoint', 'MultiLineString', 'MultiPolygon' or 'Circle').
-     * @type {string}
-     */
-    type: {
-      type: String,
-      required: true,
-      validator: value => Object.values(GEOMETRY_TYPE).includes(transformType(value)),
-    },
-    /**
-     * Stop click, singleclick, and doubleclick events from firing during drawing.
-     * @type {boolean}
-     */
-    stopClick: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * The number of points that can be drawn before a polygon ring or line string is finished.
-     * @type {number|undefined}
-     */
-    maxPoints: Number,
-    /**
-     * The number of points that must be drawn before a polygon ring or line string can be finished.
-     * Default is `3` for polygon rings and `2` for line strings.
-     * @type {number|undefined}
-     */
-    minPoints: Number,
-    /**
-     * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether the drawing can be finished.
-     * @type {function|undefined}
-     */
-    finishCondition: Function,
-    /**
-     * Function that is called when a geometry's coordinates are updated.
-     * @type {function|undefined}
-     */
-    geometryFunction: Function,
-    /**
-     * Name of the geometry attribute for newly created features.
-     * @type {string}
-     */
-    geometryName: {
-      type: String,
-      default: 'geometry',
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
-     * By default `ol.events.condition.noModifierKeys`, i.e. a click, adds a vertex or deactivates freehand drawing.
-     * @type {function|undefined}
-     */
-    condition: {
-      type: Function,
-      default: noModifierKeys,
-    },
-    /**
-     * Operate in freehand mode for lines, polygons, and circles. This makes the interaction always operate in
-     * freehand mode and takes precedence over any `freehandCondition` option.
-     * @type {boolean}
-     */
-    freehand: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * Condition that activates freehand drawing for lines and polygons. This function takes an `ol.MapBrowserEvent` and
-     * returns a boolean to indicate whether that event should be handled. The default is `ol.events.condition.shiftKeyOnly`,
-     * meaning that the Shift key activates freehand drawing.
-     * @type {function|undefined}
-     */
-    freehandCondition: {
-      type: Function,
-      default: shiftKeyOnly,
-    },
-    /**
-     * Wrap the world horizontally on the sketch overlay.
-     * @type {boolean}
-     */
-    wrapX: {
-      type: Boolean,
-      default: false,
-    },
-  }
-
-  /**
-   * @vueMethods
-   */
-  const methods = {
-    /**
-     * @return {Promise<Draw>}
-     * @protected
-     */
-    async createInteraction () {
-      let sourceIdent = this.makeIdent(this.source)
-      let source = await this.$identityMap.get(sourceIdent, this.$options.INSTANCE_PROMISE_POOL)
-
-      if (isFunction(source.getFeatures)) {
-        let features = source.getFeatures()
-        if (isCollection(features)) {
-          source = features
-        }
-      }
-
-      return new DrawInteraction({
-        source: isVectorSource(source) ? source : undefined,
-        features: isCollection(source) ? source : undefined,
-        clickTolerance: this.clickTolerance,
-        snapTolerance: this.snapTolerance,
-        type: transformType(this.type),
-        stopClick: this.stopClick,
-        maxPoints: this.maxPoints,
-        minPoints: this.minPoints,
-        finishCondition: this.finishCondition,
-        style: this.createStyleFunc(),
-        geometryFunction: this.geometryFunction,
-        geometryName: this.geometryName,
-        condition: this.condition,
-        freehand: this.freehand,
-        freehandCondition: this.freehandCondition,
-        wrapX: this.wrapX,
-      })
-    },
-    /**
-     * @return {function(feature: Feature): Style}
-     * @protected
-     */
-    getDefaultStyles () {
-      const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
-
-      return function __selectDefaultStyleFunc (feature) {
-        if (feature.getGeometry()) {
-          return defaultStyles[feature.getGeometry().getType()]
-        }
-      }
-    },
-    /**
-     * @returns {Object}
-     * @protected
-     */
-    getServices () {
-      return mergeDescriptors(
-        this::interaction.methods.getServices(),
-        this::stylesContainer.methods.getServices(),
-      )
-    },
-    /**
-     * @return {Interaction|undefined}
-     * @protected
-     */
-    getStyleTarget () {
-      return this.$interaction
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this::interaction.methods.mount()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this::interaction.methods.unmount()
-    },
-    /**
-     * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
-     * @return {void}
-     * @protected
-     */
-    setStyle (styles) {
-      if (styles !== this._styles) {
-        this._styles = styles
-        this.scheduleRefresh()
-      }
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToInteractionChanges()
-    },
-  }
-  // todo other props?
-  const watch = makeWatchers(['source', 'type'], () => function () {
-    this.scheduleRecreate()
-  })
 
   /**
    * @alias module:draw-interaction/interaction
@@ -244,17 +28,239 @@
   export default {
     name: 'vl-interaction-draw',
     mixins: [interaction, stylesContainer],
-    props,
-    methods,
-    watch,
     stubVNode: {
       empty: false,
       attrs () {
         return {
-          class: this.$options.name,
+          id: this.vmId,
+          class: this.cmpName,
         }
       },
     },
+    props: {
+      /**
+       * Target source or collection identifier from IdentityMap.
+       * @type {String}
+       */
+      source: {
+        type: String,
+        required: true,
+      },
+      /**
+       * The maximum distance in pixels between "down" and "up" for a "up" event to be considered a "click" event and
+       * actually add a point/vertex to the geometry being drawn. Default is 6 pixels. That value was chosen for the
+       * draw interaction to behave correctly on mouse as well as on touch devices.
+       * @type {number}
+       */
+      clickTolerance: {
+        type: Number,
+        default: 6,
+      },
+      /**
+       * Pixel distance for snapping to the drawing finish.
+       * @type {number}
+       */
+      snapTolerance: {
+        type: Number,
+        default: 12,
+      },
+      /**
+       * Drawing type ('Point', 'LineString', 'Polygon', 'MultiPoint', 'MultiLineString', 'MultiPolygon' or 'Circle').
+       * @type {string}
+       */
+      type: {
+        type: String,
+        required: true,
+        validator: value => Object.values(GEOMETRY_TYPE).includes(transformType(value)),
+      },
+      /**
+       * Stop click, singleclick, and doubleclick events from firing during drawing.
+       * @type {boolean}
+       */
+      stopClick: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * The number of points that can be drawn before a polygon ring or line string is finished.
+       * @type {number|undefined}
+       */
+      maxPoints: Number,
+      /**
+       * The number of points that must be drawn before a polygon ring or line string can be finished.
+       * Default is `3` for polygon rings and `2` for line strings.
+       * @type {number|undefined}
+       */
+      minPoints: Number,
+      /**
+       * A function that takes an ol.MapBrowserEvent and returns a boolean to indicate whether the drawing can be finished.
+       * @type {function|undefined}
+       */
+      finishCondition: Function,
+      /**
+       * Function that is called when a geometry's coordinates are updated.
+       * @type {function|undefined}
+       */
+      geometryFunction: Function,
+      /**
+       * Name of the geometry attribute for newly created features.
+       * @type {string}
+       */
+      geometryName: {
+        type: String,
+        default: 'geometry',
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
+       * By default `ol.events.condition.noModifierKeys`, i.e. a click, adds a vertex or deactivates freehand drawing.
+       * @type {function|undefined}
+       */
+      condition: {
+        type: Function,
+        default: noModifierKeys,
+      },
+      /**
+       * Operate in freehand mode for lines, polygons, and circles. This makes the interaction always operate in
+       * freehand mode and takes precedence over any `freehandCondition` option.
+       * @type {boolean}
+       */
+      freehand: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * Condition that activates freehand drawing for lines and polygons. This function takes an `ol.MapBrowserEvent` and
+       * returns a boolean to indicate whether that event should be handled. The default is `ol.events.condition.shiftKeyOnly`,
+       * meaning that the Shift key activates freehand drawing.
+       * @type {function|undefined}
+       */
+      freehandCondition: {
+        type: Function,
+        default: shiftKeyOnly,
+      },
+      /**
+       * Wrap the world horizontally on the sketch overlay.
+       * @type {boolean}
+       */
+      wrapX: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    methods: {
+      /**
+       * @return {Promise<Draw>}
+       * @protected
+       */
+      async createInteraction () {
+        let sourceIdent = this.makeIdent(this.source)
+        let source = await this.$identityMap.get(sourceIdent, this.$options.INSTANCE_PROMISE_POOL)
+        assert(isVectorSource(source), `Source "${sourceIdent}" doesn't exists in the identity map.`)
+        assert(isCollection(source.getFeaturesCollection()),
+          `Source "${sourceIdent}" doesn't provide features collection.`)
+
+        return new DrawInteraction({
+          features: source.getFeaturesCollection(),
+          clickTolerance: this.clickTolerance,
+          snapTolerance: this.snapTolerance,
+          type: transformType(this.type),
+          stopClick: this.stopClick,
+          maxPoints: this.maxPoints,
+          minPoints: this.minPoints,
+          finishCondition: this.finishCondition,
+          style: this.createStyleFunc(),
+          geometryFunction: this.geometryFunction,
+          geometryName: this.geometryName,
+          condition: this.condition,
+          freehand: this.freehand,
+          freehandCondition: this.freehandCondition,
+          wrapX: this.wrapX,
+        })
+      },
+      /**
+       * @return {function(feature: Feature): Style}
+       * @protected
+       */
+      getDefaultStyles () {
+        const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
+
+        return function __selectDefaultStyleFunc (feature) {
+          if (feature.getGeometry()) {
+            return defaultStyles[feature.getGeometry().getType()]
+          }
+        }
+      },
+      /**
+       * @returns {Object}
+       * @protected
+       */
+      getServices () {
+        return mergeDescriptors(
+          this::interaction.methods.getServices(),
+          this::stylesContainer.methods.getServices(),
+        )
+      },
+      /**
+       * @return {Interaction|undefined}
+       * @protected
+       */
+      getStyleTarget () {
+        return this.$interaction
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this::interaction.methods.mount()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this::interaction.methods.unmount()
+      },
+      /**
+       * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
+       * @return {void}
+       * @protected
+       */
+      setStyle (styles) {
+        if (styles !== this._styles) {
+          this._styles = styles
+          this.scheduleRecreate()
+        }
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::interaction.methods.subscribeAll()
+        this::subscribeToInteractionChanges()
+      },
+    },
+    watch: {
+      ...makeWatchers([
+        'source',
+        'clickTolerance',
+        'snapTolerance',
+        'type',
+        'stopClick',
+        'maxPoints',
+        'minPoints',
+        'finishCondition',
+        'geometryFunction',
+        'geometryName',
+        'condition',
+        'freehand',
+        'freehandCondition',
+        'wrapX',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
   }
 
   /**
@@ -268,7 +274,7 @@
       observableFromOlEvent(this.$interaction, 'drawstart')
         .pipe(
           mapObs(evt => {
-            initFeature(evt.feature)
+            initializeFeature(evt.feature)
             return evt
           }),
         ),
@@ -276,7 +282,10 @@
     )
     this.subscribeTo(drawEvents, evt => {
       ++this.rev
-      this.$emit(evt.type, evt)
+
+      this.$nextTick(() => {
+        this.$emit(evt.type, evt)
+      })
     })
   }
 </script>
diff --git a/src/component/feature/feature.vue b/src/component/feature/feature.vue
index 9fef7efb..dccd4946 100644
--- a/src/component/feature/feature.vue
+++ b/src/component/feature/feature.vue
@@ -1,6 +1,6 @@
 <template>
-  <i :id="[$options.name, id].join('-')" :class="[$options.name]" style="display: none !important;">
-    <slot :id="id" :properties="properties" :geometry="geometry" :point="point"/>
+  <i :id="vmId" :class="cmpName" style="display: none !important;">
+    <slot :id="id" :properties="properties" :geometry="geometry" :point="point" />
   </i>
 </template>
 
@@ -8,267 +8,213 @@
   import Feature from 'ol/Feature'
   import { Observable } from 'rxjs'
   import { merge as mergeObs } from 'rxjs/observable'
-  import { distinctUntilChanged, map as mapObs, mergeAll, throttleTime } from 'rxjs/operators'
-  import uuid from 'uuid/v4'
-  import geometryContainer from '../../mixin/geometry-container'
-  import olCmp from '../../mixin/ol-cmp'
-  import projTransforms from '../../mixin/proj-transforms'
-  import stylesContainer from '../../mixin/styles-container'
-  import useMapCmp from '../../mixin/use-map-cmp'
-  import { findPointOnSurface } from '../../ol-ext/geom'
-  import observableFromOlEvent from '../../rx-ext/from-ol-event'
+  import { distinctUntilChanged, map as mapObs, mergeAll } from 'rxjs/operators'
+  import { geometryContainer, olCmp, projTransforms, stylesContainer, useMapCmp } from '../../mixin'
+  import { findPointOnSurface, getFeatureId, initializeFeature, setFeatureId } from '../../ol-ext'
+  import { observableFromOlEvent } from '../../rx-ext'
   import { hasFeature, hasMap } from '../../util/assert'
   import { isEqual, plainProps } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
 
   /**
-   * @vueProps
-   */
-  const props = /** @lends module:feature/feature# */{
-    /**
-     * Feature identifier.
-     * @type {string|number}
-     * @default UUID
-     * @vueSync
-     */
-    id: {
-      type: [String, Number],
-      default: () => uuid(),
-    },
-    /**
-     * All feature properties.
-     * @type {Object}
-     * @default {}
-     * @vueSync
-     */
-    properties: {
-      type: Object,
-      default: () => Object.create(null),
-    },
-  }
-
-  /**
-   * @vueComputed
+   * A vector object for geographic features with a geometry and other attribute properties,
+   * similar to the features in vector file formats like **GeoJSON**.
    */
-  const computed = /** @lends module:feature/feature# */{
-    /**
-     * **GeoJSON** encoded geometry.
-     * @type {Object|undefined}
-     */
-    geometry () {
-      if (this.rev && this.resolvedDataProjection && this.$geometry) {
-        return this.writeGeometryInDataProj(this.$geometry)
-      }
-    },
-    /**
-     * @return {number[]|undefined}
-     */
-    point () {
-      if (this.pointViewProj && this.resolvedDataProjection) {
-        return this.pointToDataProj(this.pointViewProj)
-      }
-    },
-    geometryViewProj () {
-      if (this.rev && this.resolvedDataProjection && this.$geometry) {
-        return this.writeGeometryInViewProj(this.$geometry)
-      }
-    },
-    pointViewProj () {
-      if (this.rev && this.$geometry) {
-        return findPointOnSurface(this.$geometry)
-      }
-    },
-  }
+  export default {
+    name: 'vl-feature',
+    mixins: [olCmp, useMapCmp, geometryContainer, stylesContainer, projTransforms],
+    props: {
+      /**
+       * All feature properties.
+       * @type {Object}
+       * @default {}
+       */
+      properties: {
+        type: Object,
+        default: () => Object.create(null),
+      },
+    },
+    computed: {
+      /**
+       * **GeoJSON** encoded geometry.
+       * @type {Object|undefined}
+       */
+      geometry () {
+        if (this.rev && this.resolvedDataProjection && this.$geometry) {
+          return this.writeGeometryInDataProj(this.$geometry)
+        }
+      },
+      /**
+       * @return {number[]|undefined}
+       */
+      point () {
+        if (this.pointViewProj && this.resolvedDataProjection) {
+          return this.pointToDataProj(this.pointViewProj)
+        }
+      },
+      geometryViewProj () {
+        if (this.rev && this.resolvedDataProjection && this.$geometry) {
+          return this.writeGeometryInViewProj(this.$geometry)
+        }
+      },
+      pointViewProj () {
+        if (this.rev && this.$geometry) {
+          return findPointOnSurface(this.$geometry)
+        }
+      },
+    },
+    methods: {
+      /**
+       * Create feature without inner style applying, feature level style
+       * will be applied in the layer level style function.
+       * @return {module:ol/Feature~Feature}
+       * @protected
+       */
+      createOlObject () {
+        let feature = new Feature(this.properties)
 
-  /**
-   * @vueMethods
-   */
-  const methods = /** @lends module:feature/feature# */{
-    /**
-     * Create feature without inner style applying, feature level style
-     * will be applied in the layer level style function.
-     * @return {Feature}
-     * @protected
-     */
-    createOlObject () {
-      let feature = new Feature(this.properties)
-      feature.setId(this.id)
-      feature.setGeometry(this.$geometry)
+        initializeFeature(feature, this.id)
+        feature.setGeometry(this.$geometry)
 
-      return feature
-    },
-    /**
-     * @return {{
-     *     getGeometry: function(): (Geometry|undefined),
-     *     setGeometry: function((Geometry|undefined)): void
-     *   }|Feature|undefined}
-     * @protected
-     */
-    getGeometryTarget () {
-      return this.$feature
-    },
-    /**
-     * @return {Object}
-     * @protected
-     */
-    getServices () {
-      const vm = this
+        return feature
+      },
+      /**
+       * @return {{
+       *     getGeometry: function(): (module:ol/geom/Geometry~Geometry|undefined),
+       *     setGeometry: function((module:ol/geom/Geometry~Geometry|undefined)): void
+       *   }|Feature|undefined}
+       * @protected
+       */
+      getGeometryTarget () {
+        return this.$feature
+      },
+      /**
+       * @return {Object}
+       * @protected
+       */
+      getServices () {
+        const vm = this
 
-      return mergeDescriptors(
-        this::olCmp.methods.getServices(),
-        this::geometryContainer.methods.getServices(),
-        this::stylesContainer.methods.getServices(),
-        {
-          get feature () { return vm.$feature },
-        },
-      )
-    },
-    /**
-     * @return {Feature|undefined}
-     * @protected
-     */
-    getStyleTarget () {
-      return this.$feature
-    },
-    /**
-     * Checks if feature lies at `pixel`.
-     * @param {number[]} pixel
-     * @return {boolean}
-     */
-    isAtPixel (pixel) {
-      hasMap(this)
+        return mergeDescriptors(
+          this::olCmp.methods.getServices(),
+          this::geometryContainer.methods.getServices(),
+          this::stylesContainer.methods.getServices(),
+          {
+            get feature () { return vm.$feature },
+          },
+        )
+      },
+      /**
+       * @return {module:ol/Feature~Feature|undefined}
+       * @protected
+       */
+      getStyleTarget () {
+        return this.$feature
+      },
+      /**
+       * Checks if feature lies at `pixel`.
+       * @param {number[]} pixel
+       * @return {boolean}
+       */
+      isAtPixel (pixel) {
+        hasMap(this)
 
-      return this.$map.forEachFeatureAtPixel(
-        pixel,
-        f => f === this.$feature,
-        { layerFilter: l => l === this.$layer },
-      )
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this.$featuresContainer && this.$featuresContainer.addFeature(this)
-      this.subscribeAll()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.unsubscribeAll()
-      this.$featuresContainer && this.$featuresContainer.removeFeature(this)
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToFeatureChanges()
-    },
-  }
-
-  const watch = {
-    /**
-     * @param {string|number} value
-     */
-    id (value) {
-      if (this.$feature && value !== this.$feature.getId()) {
-        this.$feature.setId(value)
-      }
+        return this.$map.forEachFeatureAtPixel(
+          pixel,
+          f => f === this.$feature,
+          { layerFilter: l => l === this.$layer },
+        )
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this.$featuresContainer && this.$featuresContainer.addFeature(this)
+        this.subscribeAll()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.unsubscribeAll()
+        this.$featuresContainer && this.$featuresContainer.removeFeature(this)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::subscribeToEvents()
+      },
+    },
+    watch: {
+      /**
+       * @param {string|number} value
+       */
+      id (value) {
+        if (this.$feature && value !== getFeatureId(this.$feature)) {
+          setFeatureId(this.$feature, value)
+        }
+      },
+      /**
+       * @param {Object} value
+       */
+      properties (value) {
+        value = plainProps(value)
+        if (this.$feature && !isEqual(value, plainProps(this.$feature.getProperties()))) {
+          this.$feature.setProperties(value)
+        }
+      },
     },
-    /**
-     * @param {Object} value
-     */
-    properties (value) {
-      value = plainProps(value)
-      if (this.$feature && !isEqual(value, plainProps(this.$feature.getProperties()))) {
-        this.$feature.setProperties(plainProps(value))
-      }
+    created () {
+      this::defineServices()
     },
   }
 
-  /**
-   * A vector object for geographic features with a geometry and other attribute properties,
-   * similar to the features in vector file formats like **GeoJSON**.
-   *
-   * @title vl-feature
-   * @alias module:feature/feature
-   * @vueProto
-   *
-   * @vueSlot default [scoped] Default **scoped** slot with current feature state: `id`, `properties`, GeoJSON `geometry`.
-   */
-  export default {
-    name: 'vl-feature',
-    mixins: [olCmp, useMapCmp, geometryContainer, stylesContainer, projTransforms],
-    props,
-    computed,
-    methods,
-    watch,
-    created () {
-      Object.defineProperties(this, /** @lends module:feature/feature# */{
-        /**
-         * Reference to `ol.Feature` instance.
-         * @type {Feature|undefined}
-         */
-        $feature: {
-          enumerable: true,
-          get: () => this.$olObject,
-        },
-        /**
-         * Reference to parent `Layer` instance.
-         * @type {Layer|undefined}
-         */
-        $layer: {
-          enumerable: true,
-          get: () => this.$services && this.$services.layer,
-        },
-        /**
-         * Reference to `ol.Map` instance.
-         * @type {Map|undefined}
-         */
-        $map: {
-          enumerable: true,
-          get: () => this.$services && this.$services.map,
-        },
-        /**
-         * Reference to `ol.View` instance.
-         * @type {View|undefined}
-         */
-        $view: {
-          enumerable: true,
-          get: () => this.$services && this.$services.view,
-        },
-        /**
-         * Reference to `featuresContainer`.
-         * @type {Object|undefined}
-         */
-        $featuresContainer: {
-          enumerable: true,
-          get: () => this.$services && this.$services.featuresContainer,
-        },
-      })
-    },
+  function defineServices () {
+    Object.defineProperties(this, {
+      $feature: {
+        enumerable: true,
+        get: () => this.$olObject,
+      },
+      $geometry: {
+        enumerable: true,
+        get: this.getGeometry,
+      },
+      $layer: {
+        enumerable: true,
+        get: () => this.$services && this.$services.layer,
+      },
+      $map: {
+        enumerable: true,
+        get: () => this.$services && this.$services.map,
+      },
+      $view: {
+        enumerable: true,
+        get: () => this.$services && this.$services.view,
+      },
+      $featuresContainer: {
+        enumerable: true,
+        get: () => this.$services && this.$services.featuresContainer,
+      },
+    })
   }
 
   /**
    * @return {void}
    * @private
    */
-  function subscribeToFeatureChanges () {
+  function subscribeToEvents () {
     hasFeature(this)
 
     const getPropValue = prop => this.$feature.get(prop)
-    const ft = 100
-    // all plain properties
+    // all plain properties + geometry
     const propChanges = observableFromOlEvent(
       this.$feature,
       'propertychange',
       ({ key }) => ({ prop: key, value: getPropValue(key) }),
-    ).pipe(
-      throttleTime(ft),
-      distinctUntilChanged(isEqual),
     )
     // id, style and other generic changes
     const changes = observableFromOlEvent(
@@ -282,20 +228,22 @@
         // todo style?
       })),
       mergeAll(),
-      throttleTime(ft),
-      distinctUntilChanged(isEqual),
     )
     // all changes
-    const allChanges = mergeObs(propChanges, changes)
+    const allChanges = mergeObs(propChanges, changes).pipe(
+      distinctUntilChanged(isEqual),
+    )
 
     this.subscribeTo(allChanges, ({ prop, value }) => {
       ++this.rev
 
-      if (prop === 'id') {
-        this.$emit(`update:${prop}`, value)
-      } else if (prop !== this.$feature.getGeometryName()) {
-        this.$emit('update:properties', Object.assign({}, this.properties, { [prop]: value }))
-      }
+      this.$nextTick(() => {
+        if (prop === 'id') {
+          this.$emit(`update:${prop}`, value)
+        } else if (prop !== this.$feature.getGeometryName()) {
+          this.$emit('update:properties', { ...this.properties, [prop]: value })
+        }
+      })
     })
   }
 </script>
diff --git a/src/component/fill-style/style.vue b/src/component/fill-style/style.vue
index 0dd28e34..4629bc43 100644
--- a/src/component/fill-style/style.vue
+++ b/src/component/fill-style/style.vue
@@ -1,6 +1,6 @@
 <script>
   import Fill from 'ol/style/Fill'
-  import style from '../../mixin/style'
+  import { style } from '../../mixin'
   import { isEqual } from '../../util/minilo'
 
   const props = {
diff --git a/src/component/geoloc/geoloc.vue b/src/component/geoloc/geoloc.vue
index 03717414..79675e72 100644
--- a/src/component/geoloc/geoloc.vue
+++ b/src/component/geoloc/geoloc.vue
@@ -1,5 +1,5 @@
 <template>
-  <i :class="[$options.name]" style="display: none !important;">
+  <i :id="vmId" :class="cmpName" style="display: none !important;">
     <slot :accuracy="accuracy" :altitude="altitude" :altitude-accuracy="altitudeAccuracy"
           :heading="heading" :position="position" :speed="speed">
     </slot>
@@ -12,152 +12,163 @@
   import { olCmp, useMapCmp, projTransforms } from '../../mixin'
   import { observableFromOlChangeEvent } from '../../rx-ext'
   import { hasGeolocation } from '../../util/assert'
+  import { isEqual } from '../../util/minilo'
 
-  const props = {
-    tracking: {
-      type: Boolean,
-      default: true,
+  export default {
+    name: 'vl-geoloc',
+    mixins: [olCmp, useMapCmp, projTransforms],
+    props: {
+      tracking: {
+        type: Boolean,
+        default: true,
+      },
+      trackingOptions: Object,
+      /**
+       * @type {string}
+       */
+      projection: String,
+    },
+    computed: {
+      accuracy () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getAccuracy()
+        }
+      },
+      altitude () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getAltitude()
+        }
+      },
+      altitudeAccuracy () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getAltitudeAccuracy()
+        }
+      },
+      heading () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getHeading()
+        }
+      },
+      speed () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getSpeed()
+        }
+      },
+      position () {
+        if (this.rev && this.$geolocation) {
+          return this.$geolocation.getPosition()
+        }
+      },
+      positionViewProj () {
+        if (this.position && this.viewProjection) {
+          return this.pointToViewProj(this.position)
+        }
+      },
     },
-    trackingOptions: Object,
-    /**
-     * @type {string}
-     */
-    projection: String,
-    // todo add autoCenter, bindToPosition
-  }
+    methods: {
+      /**
+       * @return {ol/Geolocation~Geolocation}
+       * @private
+       */
+      createOlObject () {
+        const geoloc = new Geolocation({
+          tracking: this.tracking,
+          trackingOptions: this.trackingOptions,
+          projection: this.resolvedDataProjection,
+        })
 
-  const computed = {
-    accuracy () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getAccuracy()
-      }
-    },
-    altitude () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getAltitude()
-      }
-    },
-    altitudeAccuracy () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getAltitudeAccuracy()
-      }
-    },
-    heading () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getHeading()
-      }
-    },
-    speed () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getSpeed()
-      }
-    },
-    position () {
-      if (this.rev && this.$geolocation) {
-        return this.$geolocation.getPosition()
-      }
-    },
-    positionViewProj () {
-      if (this.position && this.resolvedDataProjection) {
-        return this.pointToViewProj(this.position)
-      }
-    },
-  }
+        geoloc.set('id', this.id)
 
-  const methods = {
-    /**
-     * @return {Geolocation}
-     * @private
-     */
-    createOlObject () {
-      return new Geolocation({
-        tracking: this.tracking,
-        trackingOptions: this.trackingOptions,
-        projection: this.resolvedDataProjection,
-      })
-    },
-    /**
-     * @return {void}
-     * @private
-     */
-    mount () {
-      this.subscribeAll()
-    },
-    /**
-     * @return {void}
-     * @private
-     */
-    unmount () {
-      hasGeolocation(this)
+        return geoloc
+      },
+      /**
+       * @return {void}
+       * @private
+       */
+      mount () {
+        this.subscribeAll()
+      },
+      /**
+       * @return {void}
+       * @private
+       */
+      unmount () {
+        hasGeolocation(this)
 
-      this.unsubscribeAll()
-      this.$geolocation.setTracking(false)
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToGeolocation()
+        this.unsubscribeAll()
+        this.$geolocation.setTracking(false)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::subscribeToGeolocation()
+      },
     },
-  }
+    watch: {
+      id (value) {
+        if (!this.$geolocation || value === this.geolocation.get('id')) {
+          return
+        }
+
+        this.$geolocation.set('id', value)
+      },
+      /**
+       * @param {boolean} value
+       */
+      tracking (value) {
+        if (!this.$geolocation && value === this.$geolocation.getTracking()) {
+          return
+        }
 
-  const watch = {
-    /**
-     * @param {boolean} value
-     */
-    tracking (value) {
-      if (this.$geolocation && value !== this.$geolocation.getTracking()) {
         this.$geolocation.setTracking(value)
-      }
-    },
-    tracingOptions (value) {
-      this.$geolocation && this.$geolocation.setTrackingOptions(value)
-    },
-    resolvedDataProjection (value) {
-      if (this.$geolocation) {
+      },
+      tracingOptions (value, prevValue) {
+        if (isEqual(value, prevValue) || !this.$geolocation) return
+
+        this.$geolocation.setTrackingOptions(value)
+      },
+      resolvedDataProjection (value) {
+        if (!this.$geolocation) return
+
         this.$geolocation.setProjection(value)
-      }
+      },
     },
-  }
-
-  export default {
-    name: 'vl-geoloc',
-    mixins: [olCmp, useMapCmp, projTransforms],
-    props,
-    computed,
-    methods,
-    watch,
     stubVNode: {
       empty () {
-        return this.$options.name
+        return this.vmId
       },
     },
     created () {
-      Object.defineProperties(this, {
-        /**
-         * @type {Geolocation|undefined}
-         */
-        $geolocation: {
-          enumerable: true,
-          get: () => this.$olObject,
-        },
-        $map: {
-          enumerable: true,
-          get: () => this.$services && this.$services.map,
-        },
-        /**
-         * Reference to `ol.View` instance.
-         * @type {View|undefined}
-         */
-        $view: {
-          enumerable: true,
-          get: () => this.$services && this.$services.view,
-        },
-      })
+      this::defineServices()
     },
   }
 
+  function defineServices () {
+    Object.defineProperties(this, {
+      /**
+       * @type {ol/Geolocation~Geolocation|undefined}
+       */
+      $geolocation: {
+        enumerable: true,
+        get: () => this.$olObject,
+      },
+      $map: {
+        enumerable: true,
+        get: () => this.$services && this.$services.map,
+      },
+      /**
+       * Reference to `ol.View` instance.
+       * @type {module:ol/View~View|undefined}
+       */
+      $view: {
+        enumerable: true,
+        get: () => this.$services && this.$services.view,
+      },
+    })
+  }
+
   /**
    * @return {void}
    * @private
@@ -165,7 +176,7 @@
   function subscribeToGeolocation () {
     hasGeolocation(this)
 
-    const ft = 100
+    const ft = 1000 / 60
     const changes = merge(
       observableFromOlChangeEvent(
         this.$geolocation,
@@ -184,13 +195,15 @@
         'position',
         true,
         ft,
-        () => this.position,
       ),
     )
 
     this.subscribeTo(changes, ({ prop, value }) => {
       ++this.rev
-      this.$emit(`update:${prop}`, value)
+
+      this.$nextTick(() => {
+        this.$emit(`update:${prop}`, value)
+      })
     })
   }
 </script>
diff --git a/src/component/graticule/graticule.vue b/src/component/graticule/graticule.vue
index efab90a4..fb19e309 100644
--- a/src/component/graticule/graticule.vue
+++ b/src/component/graticule/graticule.vue
@@ -1,5 +1,5 @@
 <template>
-  <i :class="$options.name" style="display: none !important;">
+  <i :id="vmId" :class="cmpName" style="display: none !important;">
     <slot name="lon"></slot>
     <slot name="lat"></slot>
     <slot name="stroke"></slot>
@@ -17,204 +17,227 @@
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import { makeWatchers } from '../../util/vue-helpers'
 
-  const props = {
-    maxLines: {
-      type: Number,
-      default: 100,
-    },
-    targetSize: {
-      type: Number,
-      default: 100,
-    },
-    showLabels: {
-      type: Boolean,
-      default: false,
-    },
-    lonLabelFormatter: Function,
-    latLabelFormatter: Function,
-    lonLabelPosition: {
-      type: Number,
-      default: 0,
-    },
-    latLabelPosition: {
-      type: Number,
-      default: 1,
-    },
-    intervals: {
-      type: Array,
-      default: () => [90, 45, 30, 20, 10, 5, 2, 1, 0.5, 0.2, 0.1, 0.05, 0.01, 0.005, 0.002, 0.001],
-    },
-  }
-
-  const computed = {
-    meridians () {
-      if (this.$graticule && this.rev) {
-        return map(this.getMeridians(), meridian => this.lineToDataProj(meridian.getCoordinates()))
-      }
-
-      return []
+  export default {
+    name: 'vl-graticule',
+    mixins: [olCmp, useMapCmp, projTransforms],
+    props: {
+      maxLines: {
+        type: Number,
+        default: 100,
+      },
+      targetSize: {
+        type: Number,
+        default: 100,
+      },
+      showLabels: {
+        type: Boolean,
+        default: false,
+      },
+      lonLabelFormatter: Function,
+      latLabelFormatter: Function,
+      lonLabelPosition: {
+        type: Number,
+        default: 0,
+      },
+      latLabelPosition: {
+        type: Number,
+        default: 1,
+      },
+      intervals: {
+        type: Array,
+        default: () => [90, 45, 30, 20, 10, 5, 2, 1, 0.5, 0.2, 0.1, 0.05, 0.01, 0.005, 0.002, 0.001],
+      },
     },
-    parallels () {
-      if (this.$graticule && this.rev) {
-        return map(this.getParallels(), parallel => this.lineToDataProj(parallel.getCoordinates()))
-      }
+    computed: {
+      meridians () {
+        if (this.$graticule && this.rev) {
+          return map(this.getMeridians(), meridian => this.lineToDataProj(meridian.getCoordinates()))
+        }
 
-      return []
-    },
-  }
+        return []
+      },
+      parallels () {
+        if (this.$graticule && this.rev) {
+          return map(this.getParallels(), parallel => this.lineToDataProj(parallel.getCoordinates()))
+        }
 
-  const methods = {
-    createOlObject () {
-      return new Graticule({
-        maxLines: this.maxLines,
-        targetSize: this.targetSize,
-        showLabels: this.showLabels,
-        strokeStyle: this._strokeStyle,
-        lonLabelFormatter: this.lonLabelFormatter,
-        latLabelFormatter: this.latLabelFormatter,
-        lonLabelPosition: this.lonLabelPosition,
-        latLabelPosition: this.latLabelPosition,
-        lonLabelStyle: this._lonLabelStyle,
-        latLabelStyle: this._latLabelStyle,
-        intervals: this.intervals,
-      })
-    },
-    /**
-     * @return {Promise} Resolves when initialization completes
-     * @protected
-     */
-    init () {
-      return this::olCmp.methods.init()
-    },
-    /**
-     * @return {void|Promise<void>}
-     * @protected
-     */
-    deinit () {
-      return this::olCmp.methods.deinit()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this.$map && this.$graticule.setMap(this.$map)
-      this.subscribeAll()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.unsubscribeAll()
-      this.$graticule.setMap(undefined)
+        return []
+      },
     },
-    getMeridians () {
-      hasGraticule(this)
+    methods: {
+      createOlObject () {
+        const graticule = new Graticule({
+          maxLines: this.maxLines,
+          targetSize: this.targetSize,
+          showLabels: this.showLabels,
+          strokeStyle: this._strokeStyle,
+          lonLabelFormatter: this.lonLabelFormatter,
+          latLabelFormatter: this.latLabelFormatter,
+          lonLabelPosition: this.lonLabelPosition,
+          latLabelPosition: this.latLabelPosition,
+          lonLabelStyle: this._lonLabelStyle,
+          latLabelStyle: this._latLabelStyle,
+          intervals: this.intervals,
+        })
+
+        graticule.id = this.id
+
+        return graticule
+      },
+      /**
+       * @return {Promise} Resolves when initialization completes
+       * @protected
+       */
+      init () {
+        return this::olCmp.methods.init()
+      },
+      /**
+       * @return {void|Promise<void>}
+       * @protected
+       */
+      deinit () {
+        return this::olCmp.methods.deinit()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this.$map && this.$graticule.setMap(this.$map)
+        this.subscribeAll()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.unsubscribeAll()
+        this.$graticule.setMap(undefined)
+      },
+      getMeridians () {
+        hasGraticule(this)
 
-      return this.$graticule.getMeridians()
-    },
-    getParallels () {
-      hasGraticule(this)
+        return this.$graticule.getMeridians()
+      },
+      getParallels () {
+        hasGraticule(this)
 
-      return this.$graticule.getParallels()
-    },
-    setStroke (stroke) {
-      stroke = stroke instanceof Vue ? stroke.$style : stroke
+        return this.$graticule.getParallels()
+      },
+      setStroke (stroke) {
+        stroke = stroke instanceof Vue ? stroke.$style : stroke
 
-      if (stroke !== this._strokeStyle) {
-        this._strokeStyle = stroke
-        this.scheduleRefresh()
-      }
-    },
-    setText (text) {
-      text = text instanceof Vue ? text.$style : text
-
-      let vm
-      if (text) {
-        vm = firstEl(text[this.$options.VM_PROP])
-      }
-
-      const vmMatcher = vnode => vnode.componentInstance && vnode.componentInstance === vm
-
-      if (
-        (text == null && this.$slots.lon == null) ||
-        (Array.isArray(this.$slots.lon) && this.$slots.lon.some(vmMatcher))
-      ) {
-        if (text !== this._lonLabelStyle) {
-          this._lonLabelStyle = text
+        if (stroke !== this._strokeStyle) {
+          this._strokeStyle = stroke
           this.scheduleRefresh()
         }
-      } else if (
-        (text == null && this.$slots.lat == null) ||
-        (Array.isArray(this.$slots.lat) && this.$slots.lat.some(vmMatcher))
-      ) {
-        if (text !== this._latLabelStyle) {
-          this._latLabelStyle = text
-          this.scheduleRefresh()
-        }
-      }
-    },
-    getServices () {
-      const vm = this
+      },
+      setText (text) {
+        text = text instanceof Vue ? text.$style : text
 
-      return mergeDescriptors(this::olCmp.methods.getServices(), {
-        get stylesContainer () { return vm },
-      })
-    },
-    /**
-     * @return {Promise}
-     */
-    refresh () {
-      return this.recreate()
-    },
-    subscribeAll () {
-      hasMap(this)
+        let vm
+        if (text) {
+          vm = firstEl(text[this.$options.VM_PROP])
+        }
 
-      const ft = 1000 / 60
-      const postcompose = observableFromOlEvent(this.$map, 'postcompose')
-        .pipe(throttleTime(ft))
+        const vmMatcher = vnode => vnode.componentInstance && vnode.componentInstance === vm
+
+        if (
+          (text == null && this.$slots.lon == null) ||
+          (Array.isArray(this.$slots.lon) && this.$slots.lon.some(vmMatcher))
+        ) {
+          if (text !== this._lonLabelStyle) {
+            this._lonLabelStyle = text
+            this.scheduleRefresh()
+          }
+        } else if (
+          (text == null && this.$slots.lat == null) ||
+          (Array.isArray(this.$slots.lat) && this.$slots.lat.some(vmMatcher))
+        ) {
+          if (text !== this._latLabelStyle) {
+            this._latLabelStyle = text
+            this.scheduleRefresh()
+          }
+        }
+      },
+      getServices () {
+        const vm = this
 
-      this.subscribeTo(postcompose, () => {
-        ++this.rev
-      })
+        return mergeDescriptors(this::olCmp.methods.getServices(), {
+          get stylesContainer () { return vm },
+        })
+      },
+      /**
+       * @return {Promise}
+       */
+      refresh () {
+        return this.recreate()
+      },
+      subscribeAll () {
+        this::subscribeToEvents()
+      },
     },
-  }
-
-  const watch = makeWatchers(Object.keys(props), () => function () {
-    this.scheduleRefresh()
-  })
+    watch: {
+      id (value) {
+        if (!this.$graticule || value === this.$graticule.id) {
+          return
+        }
 
-  export default {
-    name: 'vl-graticule',
-    mixins: [olCmp, useMapCmp, projTransforms],
-    props,
-    computed,
-    methods,
-    watch,
+        this.$graticule.id = value
+      },
+      ...makeWatchers([
+        'maxLines',
+        'targetSize',
+        'showLabels',
+        'lonLabelFormatter',
+        'latLabelFormatter',
+        'lonLabelPosition',
+        'latLabelPosition',
+        'intervals',
+      ], () => function () {
+        this.scheduleRefresh()
+      }),
+    },
     stubVNode: {
       empty: false,
       attrs () {
         return {
-          class: this.$options.name,
+          id: this.vmId,
+          class: this.cmpName,
         }
       },
     },
     created () {
-      Object.defineProperties(this, {
-        $graticule: {
-          enumerable: true,
-          get: () => this.$olObject,
-        },
-        $map: {
-          enumerable: true,
-          get: () => this.$services && this.$services.map,
-        },
-        $view: {
-          enumerable: true,
-          get: () => this.$services && this.$services.view,
-        },
-      })
+      this::defineServices()
     },
   }
+
+  function defineServices () {
+    Object.defineProperties(this, {
+      $graticule: {
+        enumerable: true,
+        get: () => this.$olObject,
+      },
+      $map: {
+        enumerable: true,
+        get: () => this.$services && this.$services.map,
+      },
+      $view: {
+        enumerable: true,
+        get: () => this.$services && this.$services.view,
+      },
+    })
+  }
+
+  function subscribeToEvents () {
+    hasMap(this)
+
+    const ft = 1000 / 60
+    const postcompose = observableFromOlEvent(this.$map, 'postcompose')
+      .pipe(throttleTime(ft))
+
+    this.subscribeTo(postcompose, () => {
+      ++this.rev
+    })
+  }
 </script>
diff --git a/src/component/group-layer/layer.vue b/src/component/group-layer/layer.vue
index 556fdfa3..ada4a589 100644
--- a/src/component/group-layer/layer.vue
+++ b/src/component/group-layer/layer.vue
@@ -1,45 +1,31 @@
 <script>
   import GroupLayer from 'ol/layer/Group'
   import { layer, layersContainer } from '../../mixin'
-  import { IndexedCollectionAdapter } from '../../ol-ext'
-  import { hasLayer } from '../../util/assert'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
 
-  const methods = {
-    createLayer () {
-      return new GroupLayer({
-        id: this.id,
-        minResolution: this.minResolution,
-        maxResolution: this.maxResolution,
-        opacity: this.opacity,
-        visible: this.visible,
-        extent: this.extent,
-        zIndex: this.zIndex,
-      })
-    },
-    getLayersTarget () {
-      hasLayer(this)
-
-      if (this._layersTarget == null) {
-        this._layersTarget = new IndexedCollectionAdapter(
-          this.$layer.getLayers(),
-          layer => layer.get('id'),
-        )
-      }
-
-      return this._layersTarget
-    },
-    getServices () {
-      return mergeDescriptors(
-        this::layer.methods.getServices(),
-        this::layersContainer.methods.getServices()
-      )
-    },
-  }
-
+  // todo add computed property layerIds - ids of child layers
   export default {
     name: 'vl-layer-group',
     mixins: [layer, layersContainer],
-    methods,
+    methods: {
+      createLayer () {
+        return new GroupLayer({
+          id: this.id,
+          minResolution: this.minResolution,
+          maxResolution: this.maxResolution,
+          opacity: this.opacity,
+          visible: this.visible,
+          extent: this.extent,
+          zIndex: this.zIndex,
+          layers: this._layersCollection,
+        })
+      },
+      getServices () {
+        return mergeDescriptors(
+          this::layer.methods.getServices(),
+          this::layersContainer.methods.getServices()
+        )
+      },
+    },
   }
 </script>
diff --git a/src/component/heatmap-layer/index.js b/src/component/heatmap-layer/index.js
new file mode 100644
index 00000000..6c894f3f
--- /dev/null
+++ b/src/component/heatmap-layer/index.js
@@ -0,0 +1,21 @@
+import { pick } from '../../util/minilo'
+import Layer from './layer.vue'
+
+function plugin (Vue, options = {}) {
+  if (plugin.installed) {
+    return
+  }
+  plugin.installed = true
+
+  options = pick(options, 'dataProjection')
+  Object.assign(Layer, options)
+
+  Vue.component(Layer.name, Layer)
+}
+
+export default plugin
+
+export {
+  Layer,
+  plugin as install,
+}
diff --git a/src/component/heatmap-layer/layer.vue b/src/component/heatmap-layer/layer.vue
new file mode 100644
index 00000000..b4a7624e
--- /dev/null
+++ b/src/component/heatmap-layer/layer.vue
@@ -0,0 +1,75 @@
+<script>
+  import HeatmapLayer from 'ol/layer/Heatmap'
+  import { isEqual } from '../../util/minilo'
+  import { makeWatchers } from '../../util/vue-helpers'
+  import { vectorLayer } from '../../mixin'
+
+  export default {
+    name: 'vl-layer-heatmap',
+    mixins: [vectorLayer],
+    props: {
+      gradient: {
+        type: Array,
+        default: () => ['#0000ff', '#00ffff', '#00ff00', '#ffff00', '#f00'],
+      },
+      radius: {
+        type: Number,
+        default: 8,
+      },
+      blur: {
+        type: Number,
+        default: 15,
+      },
+      shadow: {
+        type: Number,
+        default: 250,
+      },
+      weight: {
+        type: String,
+        default: 'weight',
+      },
+    },
+    methods: {
+      createLayer () {
+        return new HeatmapLayer({
+          id: this.id,
+          minResolution: this.minResolution,
+          maxResolution: this.maxResolution,
+          opacity: this.opacity,
+          visible: this.visible,
+          extent: this.extent,
+          zIndex: this.zIndex,
+          renderMode: this.renderMode,
+          gradient: this.gradient,
+          radius: this.radius,
+          blur: this.blur,
+          shadow: this.shadow,
+          weight: this.weight,
+        })
+      },
+    },
+    watch: {
+      blur (value) {
+        if (!this.$layer || this.$layer.getBlur() === value) return
+
+        this.$layer.setBlur(value)
+      },
+      gradient (value) {
+        if (!this.$layer || isEqual(this.$layer.getGradient(), value)) return
+
+        this.$layer.setGradient(value)
+      },
+      radius (value) {
+        if (!this.$layer || this.$layer.getRadius() === value) return
+
+        this.$layer.setRadius(value)
+      },
+      ...makeWatchers([
+        'shadow',
+        'weight',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
+  }
+</script>
diff --git a/src/component/icon-style/style.vue b/src/component/icon-style/style.vue
index 08d32b9f..a6d816bf 100644
--- a/src/component/icon-style/style.vue
+++ b/src/component/icon-style/style.vue
@@ -1,116 +1,151 @@
 <script>
   import Icon from 'ol/style/Icon'
-  import imageStyle from '../../mixin/image-style'
-  import { isEqual } from '../../util/minilo'
-
-  const props = {
-    src: {
-      type: String,
-      required: true,
-    },
-    size: {
-      type: Array,
-      validator: value => value.length === 2,
-    },
-    anchor: {
-      type: Array,
-      default: () => [0.5, 0.5],
-      validator: value => value.length === 2,
-    },
-    anchorOrigin: {
-      type: String,
-      default: 'top-left', // bottom-left, bottom-right, top-left or top-right
-    },
-    anchorXUnits: {
-      type: String,
-      default: 'fraction', // pixels, fraction
-    },
-    anchorYUnits: {
-      type: String,
-      default: 'fraction', // pixels, fraction
-    },
-    color: [Array, String],
-    crossOrigin: String,
-    offset: {
-      type: Array,
-      default: () => [0, 0],
-      validator: value => value.length === 2,
-    },
-    offsetOrigin: {
-      type: String,
-      default: 'top-left', // bottom-left, bottom-right, top-left or top-right
-    },
-    opacity: {
-      type: Number,
-      default: 1,
-    },
-    scale: {
-      type: Number,
-      default: 1,
-    },
-    rotateWithView: {
-      type: Boolean,
-      default: false,
-    },
-    rotation: {
-      type: Number,
-      default: 0,
-    },
-  }
-
-  const methods = {
-    /**
-     * @return {Icon}
-     * @protected
-     */
-    createStyle () {
-      return new Icon({
-        anchor: this.anchor,
-        anchorOrigin: this.anchorOrigin,
-        anchorXUnits: this.anchorXUnits,
-        anchorYUnits: this.anchorYUnits,
-        color: this.color,
-        crossOrigin: this.crossOrigin,
-        offset: this.offset,
-        offsetOrigin: this.offsetOrigin,
-        opacity: this.opacity,
-        scale: this.scale,
-        rotateWithView: this.rotateWithView,
-        rotation: this.rotation,
-        size: this.size,
-        src: this.src,
-      })
-    },
-  }
-  // todo other watchers
-  const watch = {
-    src (value) {
-      if (this.$style && !isEqual(value, this.$style.getSrc())) {
-        this.scheduleRefresh()
-      }
-    },
-    size (value) {
-      if (this.$style && !isEqual(value, this.$style.getSize())) {
-        this.scheduleRefresh()
-      }
-    },
-    anchor (value) {
-      if (this.$style && !isEqual(value, this.$style.getAnchor())) {
-        this.scheduleRefresh()
-      }
-    },
-    scale (value) {
-      if (this.$style && !isEqual(value, this.$style.getScale())) {
-        this.scheduleRefresh()
-      }
-    },
-  }
+  import { imageStyle } from '../../mixin'
+  import { assert } from '../../util/assert'
+  import { arrayLengthValidator, isEmpty, isEqual } from '../../util/minilo'
+  import { makeWatchers } from '../../util/vue-helpers'
 
   export default {
     name: 'vl-style-icon',
     mixins: [imageStyle],
-    props,
-    methods,
-    watch,
+    props: {
+      src: String,
+      size: {
+        type: Array,
+        validator: arrayLengthValidator(2),
+      },
+      img: Image,
+      imgSize: {
+        type: Array,
+        validator: arrayLengthValidator(2),
+      },
+      anchor: {
+        type: Array,
+        default: () => [0.5, 0.5],
+        validator: arrayLengthValidator(2),
+      },
+      anchorOrigin: {
+        type: String,
+        default: 'top-left', // bottom-left, bottom-right, top-left or top-right
+      },
+      anchorXUnits: {
+        type: String,
+        default: 'fraction', // pixels, fraction
+      },
+      anchorYUnits: {
+        type: String,
+        default: 'fraction', // pixels, fraction
+      },
+      color: [Array, String],
+      crossOrigin: String,
+      offset: {
+        type: Array,
+        default: () => [0, 0],
+        validator: arrayLengthValidator(2),
+      },
+      offsetOrigin: {
+        type: String,
+        default: 'top-left', // bottom-left, bottom-right, top-left or top-right
+      },
+      opacity: {
+        type: Number,
+        default: 1,
+      },
+      scale: {
+        type: Number,
+        default: 1,
+      },
+      rotateWithView: {
+        type: Boolean,
+        default: false,
+      },
+      rotation: {
+        type: Number,
+        default: 0,
+      },
+    },
+    methods: {
+      /**
+       * @return {Icon}
+       * @protected
+       */
+      createStyle () {
+        assert((this.src && !this.img) || (!this.src && this.img), `vl-style-icon one of 'image' or 'src' prop must be provided.`)
+        assert(!this.img || (this.img && !isEmpty(this.imgSize)), `vl-style-icon 'imgSize' must be set when image is provided.`)
+
+        return new Icon({
+          anchor: this.anchor,
+          anchorOrigin: this.anchorOrigin,
+          anchorXUnits: this.anchorXUnits,
+          anchorYUnits: this.anchorYUnits,
+          color: this.color,
+          crossOrigin: this.crossOrigin,
+          offset: this.offset,
+          offsetOrigin: this.offsetOrigin,
+          opacity: this.opacity,
+          scale: this.scale,
+          rotateWithView: this.rotateWithView,
+          rotation: this.rotation,
+          size: this.size,
+          src: this.src,
+          img: this.img,
+          imgSize: this.imgSize,
+        })
+      },
+    },
+    watch: {
+      src (value) {
+        if (this.$style && !isEqual(value, this.$style.getSrc())) {
+          this.scheduleRefresh()
+        }
+      },
+      size (value) {
+        if (this.$style && !isEqual(value, this.$style.getSize())) {
+          this.scheduleRefresh()
+        }
+      },
+      anchor (value) {
+        if (this.$style && !isEqual(value, this.$style.getAnchor())) {
+          this.scheduleRefresh()
+        }
+      },
+      color (value) {
+        if (this.$style && !isEqual(value, this.$style.getColor())) {
+          this.scheduleRefresh()
+        }
+      },
+      opacity (value) {
+        if (this.$style && !isEqual(value, this.$style.getOpacity())) {
+          this.scheduleRefresh()
+        }
+      },
+      scale (value) {
+        if (this.$style && !isEqual(value, this.$style.getScale())) {
+          this.scheduleRefresh()
+        }
+      },
+      rotateWithView (value) {
+        if (this.$style && !isEqual(value, this.$style.getRotateWithView())) {
+          this.scheduleRefresh()
+        }
+      },
+      rotation (value) {
+        if (this.$style && !isEqual(value, this.$style.getRotation())) {
+          this.scheduleRefresh()
+        }
+      },
+      ...makeWatchers([
+        'anchorOrigin',
+        'anchorXUnits',
+        'anchorYUnits',
+        'crossOrigin',
+        'offset',
+        'offsetOrigin',
+        'img',
+        'imgSize',
+      ], () => function () {
+        this.scheduleRefresh()
+      }),
+    },
   }
 </script>
diff --git a/src/component/image-layer/layer.vue b/src/component/image-layer/layer.vue
index d92c0dd7..a6fd84fb 100644
--- a/src/component/image-layer/layer.vue
+++ b/src/component/image-layer/layer.vue
@@ -1,6 +1,6 @@
 <script>
   import ImageLayer from 'ol/layer/Image'
-  import layer from '../../mixin/layer'
+  import { layer } from '../../mixin'
 
   /**
    * @vueProps
diff --git a/src/component/image-static-source/source.vue b/src/component/image-static-source/source.vue
index b126dee8..5ae7ab35 100644
--- a/src/component/image-static-source/source.vue
+++ b/src/component/image-static-source/source.vue
@@ -1,7 +1,6 @@
 <script>
   import ImageStaticSource from 'ol/source/ImageStatic'
-  import imageSource from '../../mixin/image-source'
-  import withUrl from '../../mixin/with-url'
+  import { imageSource, withUrl } from '../../mixin'
   import { makeWatchers } from '../../util/vue-helpers'
 
   /**
diff --git a/src/component/image-wms-source/source.vue b/src/component/image-wms-source/source.vue
index c84137fc..45f117b0 100644
--- a/src/component/image-wms-source/source.vue
+++ b/src/component/image-wms-source/source.vue
@@ -10,7 +10,7 @@
     },
     serverType: {
       type: String,
-      validator: value => !value | Object.values(WMSServerType).includes(value),
+      validator: value => !value || Object.values(WMSServerType).includes(value),
     },
     imageLoadFunction: Function,
     ratio: {
diff --git a/src/component/line-string-geom/geom.vue b/src/component/line-string-geom/geom.vue
index 1471ea70..c706865d 100644
--- a/src/component/line-string-geom/geom.vue
+++ b/src/component/line-string-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import LineString from 'ol/geom/LineString'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {}
diff --git a/src/component/map/map.vue b/src/component/map/map.vue
index 53524642..6eaf0c76 100644
--- a/src/component/map/map.vue
+++ b/src/component/map/map.vue
@@ -1,474 +1,436 @@
 <template>
-  <div :class="[$options.name]" :tabindex="tabindex">
+  <div :id="vmId" :class="cmpName" :tabindex="tabindex">
     <slot/>
   </div>
 </template>
 
 <script>
+  import Collection from 'ol/Collection'
   import { defaults as createDefaultControls } from 'ol/control'
   import { defaults as createDefaultInteractions } from 'ol/interaction'
   import VectorLayer from 'ol/layer/Vector'
-  import Collection from 'ol/Collection'
   import Map from 'ol/Map'
-  import WebGLMap from 'ol/WebGLMap'
   import VectorSource from 'ol/source/Vector'
   import View from 'ol/View'
   import { merge as mergeObs } from 'rxjs/observable'
   import { distinctUntilChanged, map as mapObs, throttleTime } from 'rxjs/operators'
   import Vue from 'vue'
-  import { olCmp, overlaysContainer, layersContainer, interactionsContainer, featuresContainer } from '../../mixin'
-  import projTransforms from '../../mixin/proj-transforms'
-  import { RENDERER_TYPE, getFeatureId, IndexedCollectionAdapter } from '../../ol-ext'
+  import {
+    featuresContainer,
+    interactionsContainer,
+    layersContainer,
+    olCmp,
+    overlaysContainer,
+    projTransforms,
+  } from '../../mixin'
+  import { getMapId, initializeInteraction, setMapDataProjection, setMapId } from '../../ol-ext'
   import { observableFromOlEvent } from '../../rx-ext'
   import { hasMap, hasView } from '../../util/assert'
-  import { isEqual } from '../../util/minilo'
+  import { isEqual, isPlainObject } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import { makeWatchers } from '../../util/vue-helpers'
 
-  const props = {
-    /**
-     * Options for default controls added to the map by default. Set to `false` to disable all map controls. Object
-     * value is used to configure controls.
-     * @type {Object|boolean}
-     * @todo remove when vl-control-* components will be ready
-     */
-    controls: {
-      type: [Object, Boolean],
-      default: true,
-    },
-    /**
-     * The element to listen to keyboard events on. For example, if this option is set to `document` the keyboard
-     * interactions will always trigger. If this option is not specified, the element the library listens to keyboard
-     * events on is the component root element.
-     * @type {string|Element|Document}
-     */
-    keyboardEventTarget: [String, Element, Document],
-    /**
-     * When set to `true`, tiles will be loaded during animations.
-     * @type {boolean}
-     */
-    loadTilesWhileAnimating: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * When set to `true`, tiles will be loaded while interacting with the map.
-     * @type {boolean}
-     */
-    loadTilesWhileInteracting: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * The minimum distance in pixels the cursor must move to be detected as a map move event instead of a click.
-     * Increasing this value can make it easier to click on the map.
-     * @type {Number}
-     */
-    moveTolerance: {
-      type: Number,
-      default: 1,
-    },
-    /**
-     * The ratio between physical pixels and device-independent pixels (dips) on the device.
-     * @type {number}
-     */
-    pixelRatio: {
-      type: Number,
-      default: () => window.devicePixelRatio || 1,
-    },
-    /**
-     * Renderer. By default, **Canvas** and **WebGL** renderers are tested for support in that order,
-     * and the first supported used. **Note** that the **Canvas** renderer fully supports vector data,
-     * but **WebGL** can only render **Point** geometries.
-     * @type {string|string[]}
-     * @default ['canvas', 'webgl']
-     */
-    renderer: {
-      type: String,
-      default: RENDERER_TYPE.CANVAS,
-      validator: value => Object.values(RENDERER_TYPE).includes(value),
-    },
-    /**
-     * Root element `tabindex` attribute value. Value should be provided to allow keyboard events on map.
-     * @type {number|string}
-     */
-    tabindex: [String, Number],
-    /**
-     * Projection for input/output coordinates in plain data.
-     * @type {string}
-     */
-    dataProjection: String,
-    wrapX: {
-      type: Boolean,
-      default: true,
+  /**
+   * Container for **layers**, **interactions**, **controls** and **overlays**. It responsible for viewport
+   * rendering and low level interaction events.
+   */
+  export default {
+    name: 'vl-map',
+    mixins: [
+      olCmp,
+      layersContainer,
+      interactionsContainer,
+      overlaysContainer,
+      featuresContainer,
+      projTransforms,
+    ],
+    props: {
+      /**
+       * Options for default controls added to the map by default. Set to `false` to disable all map controls. Object
+       * value is used to configure controls.
+       * @type {Object|boolean|Collection}
+       * @todo remove when vl-control-* components will be ready
+       */
+      defaultControls: {
+        type: [Object, Boolean, Collection],
+        default: true,
+      },
+      /**
+       * Options for default interactions added to the map by default. Object
+       * value is used to configure default interactions.
+       * @type {Object|boolean|Collection}
+       */
+      defaultInteractions: {
+        type: [Object, Boolean, Collection],
+        default: true,
+      },
+      /**
+       * The element to listen to keyboard events on. For example, if this option is set to `document` the keyboard
+       * interactions will always trigger. If this option is not specified, the element the library listens to keyboard
+       * events on is the component root element.
+       * @type {string|Element|Document}
+       */
+      keyboardEventTarget: [String, Element, Document],
+      /**
+       * When set to `true`, tiles will be loaded during animations.
+       * @type {boolean}
+       */
+      loadTilesWhileAnimating: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * When set to `true`, tiles will be loaded while interacting with the map.
+       * @type {boolean}
+       */
+      loadTilesWhileInteracting: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * The minimum distance in pixels the cursor must move to be detected as a map move event instead of a click.
+       * Increasing this value can make it easier to click on the map.
+       * @type {Number}
+       */
+      moveTolerance: {
+        type: Number,
+        default: 1,
+      },
+      /**
+       * The ratio between physical pixels and device-independent pixels (dips) on the device.
+       * @type {number}
+       */
+      pixelRatio: {
+        type: Number,
+        default: () => window.devicePixelRatio || 1,
+      },
+      /**
+       * Maximum number tiles to load simultaneously.
+       * @type {number}
+       */
+      maxTilesLoading: {
+        type: Number,
+        default: 16,
+      },
+      /**
+       * Root element `tabindex` attribute value. Value should be provided to allow keyboard events on map.
+       * @type {number|string}
+       */
+      tabindex: [String, Number],
+      /**
+       * Projection for input/output coordinates in plain data.
+       * @type {string}
+       */
+      dataProjection: String,
+      /**
+       * @type {boolean}
+       */
+      wrapX: {
+        type: Boolean,
+        default: true,
+      },
     },
-  }
+    methods: {
+      /**
+       * @return {module:ol/PluggableMap~PluggableMap}
+       * @protected
+       */
+      createOlObject () {
+        const map = new Map({
+          loadTilesWhileAnimating: this.loadTilesWhileAnimating,
+          loadTilesWhileInteracting: this.loadTilesWhileInteracting,
+          pixelRatio: this.pixelRatio,
+          moveTolerance: this.moveTolerance,
+          keyboardEventTarget: this.keyboardEventTarget,
+          maxTilesLoading: this.maxTilesLoading,
+          controls: this._controlsCollection,
+          interactions: this.$interactionsCollection,
+          layers: this.$layersCollection,
+          overlays: this.$overlaysCollection,
+          view: this.$view,
+        })
 
-  const computed = {
-    mapCtor () {
-      switch (this.renderer) {
-        case RENDERER_TYPE.WEBGL:
-          return WebGLMap
-        case RENDERER_TYPE.CANVAS:
-        default:
-          return Map
-      }
-    },
-  }
+        setMapId(map, this.id)
+        setMapDataProjection(map, this.dataProjection)
+        this._featuresOverlay.setMap(map)
 
-  const methods = {
-    /**
-     * @return {Map}
-     * @protected
-     */
-    createOlObject () {
-      /* eslint-disable-next-line new-cap */
-      const map = new this.mapCtor({
-        loadTilesWhileAnimating: this.loadTilesWhileAnimating,
-        loadTilesWhileInteracting: this.loadTilesWhileInteracting,
-        pixelRatio: this.pixelRatio,
-        moveTolerance: this.moveTolerance,
-        keyboardEventTarget: this.keyboardEventTarget,
-        controls: this._controls,
-        interactions: this._interactions,
-        layers: this._layers,
-        overlays: this._overlays,
-        view: this._view,
-      })
-      map.set('dataProjection', this.dataProjection)
-      this._defaultOverlay.setMap(map)
+        return map
+      },
+      /**
+       * @param {number[]} pixel
+       * @return {number[]} Coordinates in the map data projection.
+       */
+      getCoordinateFromPixel (pixel) {
+        hasMap(this)
 
-      return map
-    },
-    /**
-     * @return {IndexedCollectionAdapter}
-     * @protected
-     */
-    getLayersTarget () {
-      hasMap(this)
+        let coordinate = this.$map.getCoordinateFromPixel(pixel)
 
-      if (this._layersTarget == null) {
-        this._layersTarget = new IndexedCollectionAdapter(
-          this.$map.getLayers(),
-          layer => layer.get('id'),
-        )
-      }
+        return this.pointToDataProj(coordinate)
+      },
+      /**
+       * @param {number[]} coordinate Coordinates in map data projection
+       * @return {number[]}
+       */
+      getPixelFromCoordinate (coordinate) {
+        hasMap(this)
 
-      return this._layersTarget
-    },
-    /**
-     * @return {IndexedCollectionAdapter}
-     * @protected
-     */
-    getInteractionsTarget () {
-      hasMap(this)
+        return this.$map.getPixelFromCoordinate(this.pointToViewProj(coordinate))
+      },
+      /**
+       * Triggers focus on map container.
+       * @return {void}
+       */
+      focus () {
+        this.$el.focus()
+      },
+      /**
+       * @param {number[]} pixel
+       * @param {function} callback
+       * @param {Object} [opts]
+       * @return {*|undefined}
+       */
+      forEachFeatureAtPixel (pixel, callback, opts = {}) {
+        hasMap(this)
 
-      if (this._interactionsTarget == null) {
-        this._interactionsTarget = new IndexedCollectionAdapter(
-          this.$map.getInteractions(),
-          interaction => interaction.get('id'),
-        )
-      }
+        return this.$map.forEachFeatureAtPixel(pixel, callback, opts)
+      },
+      /**
+       * @param {number[]} pixel
+       * @param {function} callback
+       * @param {Object} [opts]
+       * @return {*|undefined}
+       */
+      forEachLayerAtPixel (pixel, callback, opts = {}) {
+        hasMap(this)
 
-      return this._interactionsTarget
-    },
-    /**
-     * @return {function}
-     * @protected
-     */
-    getDefaultInteractionsSorter () {
-      // sort interactions by priority in asc order
-      // the higher the priority, the earlier the interaction handles the event
-      return (a, b) => {
-        let ap = a.get('priority') || 0
-        let bp = b.get('priority') || 0
-        return ap === bp ? 0 : ap - bp
-      }
-    },
-    /**
-     * @return {SourceCollectionAdapter}
-     * @protected
-     */
-    getFeaturesTarget () {
-      if (this._featuresTarget == null) {
-        this._featuresTarget = new IndexedCollectionAdapter(
-          this._defaultOverlayFeatures,
-          feature => getFeatureId(feature)
-        )
-      }
+        return this.$map.forEachLayerAtPixel(pixel, callback, opts)
+      },
+      /**
+       * @param {number[]} pixel
+       * @param {Object} [opts]
+       */
+      getFeaturesAtPixel (pixel, opts = {}) {
+        hasMap(this)
 
-      return this._featuresTarget
-    },
-    /**
-     * @return {IndexedCollectionAdapter}
-     * @protected
-     */
-    getOverlaysTarget () {
-      hasMap(this)
+        return this.$map.getFeaturesAtPixel(pixel, opts)
+      },
+      /**
+       * Updates map size and re-renders map.
+       * @return {Promise}
+       */
+      refresh () {
+        this.updateSize()
 
-      if (this._overlaysTarget == null) {
-        this._overlaysTarget = new IndexedCollectionAdapter(
-          this.$map.getOverlays(),
-          overlay => overlay.getId(),
-        )
-      }
+        return this.render().then(() => this::olCmp.methods.refresh())
+      },
+      /**
+       * @return {Promise}
+       */
+      render () {
+        return new Promise(resolve => {
+          hasMap(this)
 
-      return this._overlaysTarget
-    },
-    /**
-     * @param {number[]} pixel
-     * @return {number[]} Coordinates in the map view projection.
-     */
-    getCoordinateFromPixel (pixel) {
-      hasMap(this)
+          this.$map.once('postrender', () => resolve())
+          this.$map.render()
+        })
+      },
+      /**
+       * Updates map size.
+       * @return {void}
+       */
+      updateSize () {
+        hasMap(this)
 
-      let coordinate = this.$map.getCoordinateFromPixel(pixel)
-      return this.pointToDataProj(coordinate)
-    },
-    /**
-     * @returns {Object}
-     * @protected
-     */
-    getServices () {
-      const vm = this
+        this.$map.updateSize()
+      },
+      /**
+       * @param {module:ol/View~View|Vue|undefined} view
+       * @return {void}
+       * @protected
+       */
+      setView (view) {
+        view = view instanceof Vue ? view.$view : view
+        view || (view = new View())
 
-      return mergeDescriptors(
-        this::olCmp.methods.getServices(),
-        this::layersContainer.methods.getServices(),
-        this::interactionsContainer.methods.getServices(),
-        this::overlaysContainer.methods.getServices(),
-        this::featuresContainer.methods.getServices(),
-        {
-          get map () { return vm.$map },
-          get view () { return vm.$view },
-          get viewContainer () { return vm },
-        },
-      )
-    },
-    /**
-     * Triggers focus on map container.
-     * @return {void}
-     */
-    focus () {
-      this.$el.focus()
-    },
-    /**
-     * @param {number[]} pixel
-     * @param {function((Feature), ?Layer): *} callback
-     * @param {Object} [opts]
-     * @return {*|undefined}
-     */
-    forEachFeatureAtPixel (pixel, callback, opts = {}) {
-      hasMap(this)
-      return this.$map.forEachFeatureAtPixel(pixel, callback, opts)
-    },
-    /**
-     * @param {number[]} pixel
-     * @param {function(Layer, ?(number[]|Uint8Array)): *} callback
-     * @param {function(Layer): boolean} [layerFilter]
-     * @return {*|undefined}
-     */
-    forEachLayerAtPixel (pixel, callback, layerFilter) {
-      hasMap(this)
-      return this.$map.forEachLayerAtPixel(pixel, callback, undefined, layerFilter)
-    },
-    /**
-     * @param {View|Vue|undefined} view
-     * @return {void}
-     * @protected
-     */
-    setView (view) {
-      view = view instanceof Vue ? view.$view : view
-      view || (view = new View())
+        if (view !== this._view) {
+          this._view = view
+        }
+        if (this.$map && view !== this.$map.getView()) {
+          this.$map.setView(view)
+        }
+      },
+      /**
+       * @return {module:ol/View~View}
+       */
+      getView () {
+        return this._view
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        hasMap(this)
 
-      if (view !== this._view) {
-        this._view = view
-      }
-      if (this.$map && view !== this.$map.getView()) {
-        this.$map.setView(view)
-      }
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      hasMap(this)
-      this.$map.setTarget(this.$el)
-      this.subscribeAll()
-      this.updateSize()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      hasMap(this)
+        this.$map.setTarget(this.$el)
+        this.$nextTick(::this.updateSize)
 
-      this.clearLayers()
-      this.clearInteractions()
-      this.clearOverlays()
+        this.subscribeAll()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        hasMap(this)
 
-      this.unsubscribeAll()
-      this.$map.setTarget(undefined)
-    },
-    /**
-     * Updates map size and re-renders map.
-     * @return {Promise}
-     */
-    refresh () {
-      this.updateSize()
+        this.clearFeatures()
+        this.clearLayers()
+        this.clearInteractions()
+        this.clearOverlays()
 
-      return this.render()
-        .then(() => this::olCmp.methods.refresh())
-    },
-    /**
-     * @return {Promise}
-     */
-    render () {
-      return new Promise(resolve => {
-        hasMap(this)
-        this.$map.once('postrender', () => resolve())
-        this.$map.render()
-      })
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToMapEvents()
-    },
-    /**
-     * Updates map size.
-     * @return {void}
-     */
-    updateSize () {
-      hasMap(this)
-      this.$map.updateSize()
+        this.unsubscribeAll()
+        this.$map.setTarget(null)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::subscribeToEvents()
+      },
+      /**
+       * @returns {Object}
+       * @protected
+       */
+      getServices () {
+        const vm = this
+
+        return mergeDescriptors(
+          this::olCmp.methods.getServices(),
+          this::layersContainer.methods.getServices(),
+          this::interactionsContainer.methods.getServices(),
+          this::overlaysContainer.methods.getServices(),
+          this::featuresContainer.methods.getServices(),
+          {
+            get map () { return vm.$map },
+            get view () { return vm.$view },
+            get viewContainer () { return vm },
+          },
+        )
+      },
     },
-  }
+    watch: {
+      ...makeWatchers([
+        'keyboardEventTarget',
+        'loadTilesWhileAnimating',
+        'loadTilesWhileInteracting',
+        'moveTolerance',
+        'pixelRatio',
+        'renderer',
+        'maxTilesLoading',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+      id (value) {
+        if (!this.$map || value === getMapId(this.$map)) {
+          return
+        }
 
-  const watch = {
-    ...makeWatchers([
-      'keyboardEventTarget',
-      'loadTilesWhileAnimating',
-      'loadTilesWhileInteracting',
-      'moveTolerance',
-      'pixelRatio',
-      'renderer',
-    ], () => olCmp.methods.scheduleRecreate),
-    controls (value) {
-      if (value === false) {
-        this._controls.clear()
-        return
-      }
+        setMapId(this.$map, value)
+      },
+      controls (value) {
+        if (value === false) {
+          this._controlsCollection.clear()
+          return
+        }
 
-      value = typeof value === 'object' ? value : undefined
-      this._controls.clear()
-      this._controls.extend(createDefaultControls(value).getArray())
-    },
-    wrapX (value) {
-      if (this._defaultOverlay != null) {
-        let source = new VectorSource({
-          features: this._defaultOverlayFeatures,
+        value = typeof value === 'object' ? value : undefined
+        this._controlsCollection.clear()
+        this._controlsCollection.extend(createDefaultControls(value).getArray())
+      },
+      wrapX (value) {
+        if (this._featuresOverlay == null) return
+
+        this._featuresOverlay.setSource(new VectorSource({
+          features: this.$featuresCollection,
           wrapX: value,
-        })
-        this._defaultOverlay.setSource(source)
-      }
-    },
-    dataProjection (value) {
-      if (this.$map) {
-        this.$map.set('dataProjection', value)
+        }))
+      },
+      dataProjection (value) {
+        if (!this.$map) return
+
+        setMapDataProjection(this.$map, value)
         this.scheduleRefresh()
-      }
+      },
     },
-  }
-
-  /**
-   * Container for **layers**, **interactions**, **controls** and **overlays**. It responsible for viewport
-   * rendering and low level interaction events.
-   *
-   * @title vl-map
-   * @alias module:map/map
-   * @vueProto
-   *
-   * @fires module:map/map#click
-   * @fires module:map/map#dblclick
-   * @fires module:map/map#singleclick
-   * @fires module:map/map#pointerdrag
-   * @fires module:map/map#pointermove
-   * @fires module:map/map#movestart
-   * @fires module:map/map#moveend
-   * @fires module:map/map#postrender
-   * @fires module:map/map#precompose
-   * @fires module:map/map#postcompose
-   *
-   * @vueSlot default Default slot for all child components.
-   */
-  export default {
-    name: 'vl-map',
-    mixins: [
-      olCmp,
-      layersContainer,
-      interactionsContainer,
-      overlaysContainer,
-      featuresContainer,
-      projTransforms,
-    ],
-    props,
-    computed,
-    methods,
-    watch,
     created () {
       this._view = new View()
-      this._controls = this.controls !== false
-        ? createDefaultControls(typeof this.controls === 'object' ? this.controls : undefined)
-        : new Collection()
-      this._interactions = createDefaultInteractions()
-      this._layers = new Collection()
-      this._overlays = new Collection()
+      // todo make controls handling like with interactions
+      if (this.defaultControls instanceof Collection) {
+        this._controlsCollection = this.defaultControls
+      } else if (this.defaultControls !== false) {
+        this._controlsCollection = createDefaultControls(
+          isPlainObject(this.defaultControls)
+            ? this.defaultControls
+            : undefined,
+        )
+      }
+      // todo initialize without interactions and provide vl-interaction-default component
+      if (this.defaultInteractions instanceof Collection) {
+        this._interactionsCollection = this.defaultInteractions
+      } else if (this.defaultInteractions !== false) {
+        this._interactionsCollection = createDefaultInteractions(
+          isPlainObject(this.defaultInteractions)
+            ? this.defaultInteractions
+            : undefined,
+        )
+      }
+      this._interactionsCollection.forEach(interaction => initializeInteraction(interaction))
       // prepare default overlay
-      this._defaultOverlayFeatures = new Collection()
-      this._defaultOverlay = new VectorLayer({
+      this._featuresOverlay = new VectorLayer({
         source: new VectorSource({
-          features: this._defaultOverlayFeatures,
+          features: this.$featuresCollection,
           wrapX: this.wrapX,
         }),
       })
 
-      Object.defineProperties(this, /** @lends module:map/map# */{
-        /**
-         * OpenLayers map instance.
-         * @type {Map|undefined}
-         */
-        $map: {
-          enumerable: true,
-          get: () => this.$olObject,
-        },
-        /**
-         * OpenLayers view instance.
-         * @type {View|undefined}
-         */
-        $view: {
-          enumerable: true,
-          get: () => this._view,
-        },
-      })
+      this::defineServices()
     },
   }
 
+  function defineServices () {
+    Object.defineProperties(this, {
+      /**
+       * OpenLayers map instance.
+       * @type {module:ol/PluggableMap~PluggableMap|undefined}
+       */
+      $map: {
+        enumerable: true,
+        get: () => this.$olObject,
+      },
+      /**
+       * OpenLayers view instance.
+       * @type {module:ol/View~View}
+       */
+      $view: {
+        enumerable: true,
+        get: this.getView,
+      },
+    })
+  }
+
   /**
    * Subscribe to OL map events.
    *
    * @return {void}
    * @private
    */
-  function subscribeToMapEvents () {
+  function subscribeToEvents () {
     hasMap(this)
     hasView(this)
 
-    const ft = 100
+    const ft = 1000 / 60
     // pointer
     const pointerEvents = mergeObs(
       observableFromOlEvent(this.$map, [
@@ -497,21 +459,13 @@
       'rendercomplete',
       'precompose',
       'postcompose',
+      'rendercomplete',
     ])
 
     const events = mergeObs(pointerEvents, otherEvents)
 
-    this.subscribeTo(events, evt => this.$emit(evt.type, evt))
+    this.subscribeTo(events, evt => {
+      this.$emit(evt.type, evt)
+    })
   }
-
-  /**
-   * A click with no dragging. A double click will fire two of this.
-   * @event module:map/map#click
-   * @type {MapBrowserEvent}
-   */
-  /**
-   * A true double click, with no dragging.
-   * @event module:map/map#dblclick
-   * @type {MapBrowserEvent}
-   */
 </script>
diff --git a/src/component/map/view.vue b/src/component/map/view.vue
index c31776e1..4989ef51 100644
--- a/src/component/map/view.vue
+++ b/src/component/map/view.vue
@@ -1,6 +1,6 @@
 <template>
-  <i :class="[$options.name]" style="display: none !important;">
-    <slot :center="viewCenter" :zoom="viewZoom" :resolution="viewResolution" :rotation="viewRotation"/>
+  <i :id="vmId" :class="cmpName" style="display: none !important;">
+    <slot :center="currentCenter" :zoom="currentZoom" :resolution="currentResolution" :rotation="currentRotation"/>
   </i>
 </template>
 
@@ -13,335 +13,343 @@
   import { EPSG_3857, MAX_ZOOM, MIN_ZOOM, ZOOM_FACTOR } from '../../ol-ext'
   import { observableFromOlChangeEvent } from '../../rx-ext'
   import { hasView } from '../../util/assert'
-  import { coalesce, isEqual, isFunction, isPlainObject, noop } from '../../util/minilo'
+  import { arrayLengthValidator, coalesce, isEqual, isFunction, isPlainObject, noop } from '../../util/minilo'
+  import { makeWatchers } from '../../util/vue-helpers'
 
   /**
-   * @vueProps
+   * Represents a simple **2D view** of the map. This is the component to act upon to change the **center**,
+   * **resolution**, and **rotation** of the map.
    */
-  const props = /** @lends module:map/view# */{
-    /**
-     * The center coordinate in the view projection.
-     * @type {number[]}
-     * @default [0, 0]
-     * @vueSync
-     */
-    center: {
-      type: Array,
-      default: () => [0, 0],
-      validator: value => value.length === 2,
-    },
-    constrainRotation: {
-      type: [Boolean, Number],
-      default: true,
-    },
-    enableRotation: {
-      type: Boolean,
-      default: true,
-    },
-    /**
-     * The extent that constrains the center defined in the view projection,
-     * in other words, center cannot be set outside this extent.
-     * @default undefined
-     */
-    extent: {
-      type: Array,
-      validator: value => value.length === 4,
-    },
-    maxResolution: Number,
-    minResolution: Number,
-    /**
-     * @default 28
-     */
-    maxZoom: {
-      type: Number,
-      default: MAX_ZOOM,
-    },
-    /**
-     * @default 0
-     */
-    minZoom: {
-      type: Number,
-      default: MIN_ZOOM,
-    },
-    /**
-     * @type {string}
-     * @default EPSG:3857
-     */
-    projection: {
-      type: String,
-      default: EPSG_3857,
-    },
-    resolution: Number,
-    resolutions: Array,
-    /**
-     * The initial rotation for the view in **radians** (positive rotation clockwise).
-     * @type {number}
-     * @vueSync
-     */
-    rotation: {
-      type: Number,
-      default: 0,
-    },
-    /**
-     * Zoom level used to calculate the resolution for the view as `int` value. Only used if `resolution` is not defined.
-     * @type {number}
-     * @default 0
-     * @vueSync
-     */
-    zoom: {
-      type: Number,
-      default: MIN_ZOOM,
-    },
-    /**
-     * @default 2
-     */
-    zoomFactor: {
-      type: Number,
-      default: ZOOM_FACTOR,
+  export default {
+    name: 'vl-view',
+    mixins: [olCmp, projTransforms],
+    props: {
+      /**
+       * The center coordinate in the view projection.
+       * @type {number[]}
+       * @default [0, 0]
+       */
+      center: {
+        type: Array,
+        default: () => [0, 0],
+        validator: arrayLengthValidator(2),
+      },
+      constrainRotation: {
+        type: [Boolean, Number],
+        default: true,
+      },
+      enableRotation: {
+        type: Boolean,
+        default: true,
+      },
+      /**
+       * The extent that constrains the center defined in the view projection,
+       * in other words, center cannot be set outside this extent.
+       * @default undefined
+       */
+      extent: {
+        type: Array,
+        validator: arrayLengthValidator(4),
+      },
+      maxResolution: Number,
+      minResolution: Number,
+      /**
+       * @default 28
+       */
+      maxZoom: {
+        type: Number,
+        default: MAX_ZOOM,
+      },
+      /**
+       * @default 0
+       */
+      minZoom: {
+        type: Number,
+        default: MIN_ZOOM,
+      },
+      /**
+       * @type {string}
+       * @default EPSG:3857
+       */
+      projection: {
+        type: String,
+        default: EPSG_3857,
+      },
+      resolution: Number,
+      resolutions: Array,
+      /**
+       * The initial rotation for the view in **radians** (positive rotation clockwise).
+       * @type {number}
+       * @vueSync
+       */
+      rotation: {
+        type: Number,
+        default: 0,
+      },
+      /**
+       * Zoom level used to calculate the resolution for the view as `int` value. Only used if `resolution` is not defined.
+       * @type {number}
+       * @default 0
+       * @vueSync
+       */
+      zoom: {
+        type: Number,
+        default: MIN_ZOOM,
+      },
+      /**
+       * @default 2
+       */
+      zoomFactor: {
+        type: Number,
+        default: ZOOM_FACTOR,
+      },
     },
-  }
+    computed: {
+      currentZoom () {
+        if (this.rev && this.$view) {
+          return this.$view.getZoom()
+        }
 
-  /**
-   * @vueComputed
-   */
-  const computed = /** @lends module:map/view# */{
-    viewZoom () {
-      if (this.rev && this.$view) {
-        return Math.round(this.$view.getZoom())
-      }
+        return this.zoom
+      },
+      currentRotation () {
+        if (this.rev && this.$view) {
+          return this.$view.getRotation()
+        }
 
-      return this.zoom
-    },
-    viewRotation () {
-      if (this.rev && this.$view) {
-        return this.$view.getRotation()
-      }
+        return this.rotation
+      },
+      currentResolution () {
+        if (this.rev && this.$view) {
+          return this.$view.getResolution()
+        }
 
-      return this.rotation
+        return this.resolution
+      },
+      currentCenter () {
+        if (this.rev && this.$view) {
+          return this.pointToDataProj(this.$view.getCenter())
+        }
+      },
+      currentCenterViewProj () {
+        if (this.rev && this.$view) {
+          return this.$view.getCenter()
+        }
+      },
+      /**
+       * @return {ProjectionLike}
+       */
+      resolvedDataProjection () {
+        // exclude this.projection from lookup to allow view rendering in projection
+        // that differs from data projection
+        return coalesce(
+          this.$viewContainer && this.$viewContainer.resolvedDataProjection,
+          this.$options.dataProjection,
+          this.viewProjection,
+        )
+      },
     },
-    viewResolution () {
-      if (this.rev && this.$view) {
-        return this.$view.getResolution()
-      }
+    methods: {
+      /**
+       * @see {@link https://openlayers.org/en/latest/apidoc/module-ol_View-View.html#animate}
+       * @param {...(AnimationOptions|function(boolean))} args
+       * @return {Promise} Resolves when animation completes
+       */
+      animate (...args) {
+        hasView(this)
 
-      return this.resolution
-    },
-    viewCenter () {
-      if (this.rev && this.$view) {
-        return this.pointToDataProj(this.$view.getCenter())
-      }
-    },
-    viewCenterViewProj () {
-      if (this.rev && this.$view) {
-        return this.$view.getCenter()
-      }
-    },
-    /**
-     * @return {ProjectionLike}
-     */
-    resolvedDataProjection () {
-      // exclude this.projection from lookup to allow view rendering in projection
-      // that differs from data projection
-      return coalesce(
-        this.$viewContainer && this.$viewContainer.resolvedDataProjection,
-        this.$options.dataProjection,
-        this.viewProjection,
-      )
-    },
-  }
+        let cb = noop
+        if (isFunction(args[args.length - 1])) {
+          cb = args[args.length - 1]
+          args = args.slice(0, args.length - 1)
+        }
+        args.forEach(opts => {
+          if (!Array.isArray(opts.center)) return
+          opts.center = this.pointToViewProj(opts.center)
+        })
 
-  /**
-   * @vueMethods
-   */
-  const methods = /** @lends module:map/view# */{
-    /**
-     * @see {@link https://openlayers.org/en/latest/apidoc/ol.View.html#animate}
-     * @param {...(AnimationOptions|function(boolean))} args
-     * @return {Promise} Resolves when animation completes
-     */
-    animate (...args) {
-      hasView(this)
+        return new Promise(
+          resolve => this.$view.animate(...args, complete => {
+            cb(complete)
+            resolve(complete)
+          }),
+        )
+      },
+      /**
+       * @return {ol/View~View}
+       * @protected
+       */
+      createOlObject () {
+        const view = new View({
+          center: this.pointToViewProj(this.center),
+          constrainRotation: this.constrainRotation,
+          enableRotation: this.enableRotation,
+          extent: this.extent ? this.extentToViewProj(this.extent) : undefined,
+          maxResolution: this.maxResolution,
+          minResolution: this.minResolution,
+          maxZoom: this.maxZoom,
+          minZoom: this.minZoom,
+          projection: this.projection,
+          resolution: this.resolution,
+          resolutions: this.resolutions,
+          rotation: this.rotation,
+          zoom: this.zoom,
+          zoomFactor: this.zoomFactor,
+        })
 
-      let cb = noop
-      if (isFunction(args[args.length - 1])) {
-        cb = args[args.length - 1]
-        args = args.slice(0, args.length - 1)
-      }
-      args.forEach(opts => {
-        if (!Array.isArray(opts.center)) return
-        opts.center = this.pointToViewProj(opts.center)
-      })
+        view.set('id', this.id)
 
-      return new Promise(
-        resolve => this.$view.animate(...args, complete => {
-          cb(complete)
-          resolve(complete)
-        }),
-      )
-    },
-    /**
-     * @return {View}
-     * @protected
-     */
-    createOlObject () {
-      return new View({
-        center: this.pointToViewProj(this.center),
-        constrainRotation: this.constrainRotation,
-        enableRotation: this.enableRotation,
-        extent: this.extent ? this.extentToViewProj(this.extent) : undefined,
-        maxResolution: this.maxResolution,
-        minResolution: this.minResolution,
-        maxZoom: this.maxZoom,
-        minZoom: this.minZoom,
-        projection: this.projection,
-        resolution: this.resolution,
-        resolutions: this.resolutions,
-        rotation: this.rotation,
-        zoom: this.zoom,
-        zoomFactor: this.zoomFactor,
-      })
-    },
-    /**
-     * @see {@link https://openlayers.org/en/latest/apidoc/ol.View.html#fit}
-     * @param {Object|Extent|Geometry|Vue} geometryOrExtent
-     * @param {FitOptions} [options]
-     * @return {Promise} Resolves when view changes
-     */
-    fit (geometryOrExtent, options = {}) {
-      hasView(this)
+        return view
+      },
+      /**
+       * @see {@link https://openlayers.org/en/latest/apidoc/module-ol_View-View.html#fit}
+       * @param {Object|module:ol/geom/SimpleGeometry~SimpleGeometry|module:ol/extent~Extent|Vue} geometryOrExtent
+       * @param {FitOptions} [options]
+       * @return {Promise} Resolves when view changes
+       */
+      fit (geometryOrExtent, options = {}) {
+        hasView(this)
 
-      // transform from GeoJSON, vl-feature to ol.Feature
-      if (isPlainObject(geometryOrExtent)) {
-        geometryOrExtent = this.readGeometryInDataProj(geometryOrExtent)
-      } else if (geometryOrExtent instanceof Vue) {
-        geometryOrExtent = geometryOrExtent.$geometry
-      }
+        // transform from GeoJSON, vl-feature to ol.Feature
+        if (isPlainObject(geometryOrExtent)) {
+          geometryOrExtent = this.readGeometryInDataProj(geometryOrExtent)
+        } else if (geometryOrExtent instanceof Vue) {
+          geometryOrExtent = geometryOrExtent.$geometry
+        }
 
-      let cb = options.callback || noop
+        let cb = options.callback || noop
 
-      return new Promise(resolve => {
-        this.$view.fit(geometryOrExtent, {
-          ...options,
-          callback: complete => {
-            cb(complete)
-            resolve(complete)
-          },
+        return new Promise(resolve => {
+          this.$view.fit(geometryOrExtent, {
+            ...options,
+            callback: complete => {
+              cb(complete)
+              resolve(complete)
+            },
+          })
         })
-      })
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this.$viewContainer && this.$viewContainer.setView(this)
-      this.subscribeAll()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.unsubscribeAll()
-      this.$viewContainer && this.$viewContainer.setView(undefined)
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToViewChanges()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this.$viewContainer && this.$viewContainer.setView(this)
+        this.subscribeAll()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.unsubscribeAll()
+        this.$viewContainer && this.$viewContainer.setView(undefined)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::subscribeToEvents()
+      },
     },
-  }
+    watch: {
+      id (value) {
+        if (!this.$view || value === this.$view.get('id')) {
+          return
+        }
 
-  const watch = {
-    center (value) {
-      value = this.pointToViewProj(value)
-      if (this.$view && !this.$view.getAnimating() && !isEqual(value, this.viewCenterViewProj)) {
-        this.$view.setCenter(value)
-      }
-    },
-    resolution (value) {
-      if (this.$view && !this.$view.getAnimating() && value !== this.viewResolution) {
-        this.$view.setResolution(value)
-      }
-    },
-    zoom (value) {
-      value = Math.round(value)
-      if (this.$view && !this.$view.getAnimating() && value !== this.viewZoom) {
-        this.$view.setZoom(value)
-      }
-    },
-    rotation (value) {
-      if (this.$view && !this.$view.getAnimating() && value !== this.viewRotation) {
-        this.$view.setRotation(value)
-      }
-    },
-    minZoom (value) {
-      if (this.$view && value !== this.$view.getMinZoom()) {
-        this.$view.setMinZoom(value)
-      }
-    },
-    maxZoom (value) {
-      if (this.$view && value !== this.$view.getMaxZoom()) {
-        this.$view.setMaxZoom(value)
-      }
-    },
-    resolvedDataProjection () {
-      if (this.$view) {
-        this.$view.setCenter(this.pointToViewProj(this.center))
-      }
-    },
-  }
+        this.$view.set('id', value)
+      },
+      center (value) {
+        if (!this.$view || this.$view.getAnimating()) return
 
-  /**
-   * Represents a simple **2D view** of the map. This is the component to act upon to change the **center**,
-   * **resolution**, and **rotation** of the map.
-   *
-   * @title View `vl-view` component
-   * @alias module:map/view
-   * @vueProto
-   *
-   * @vueSlot default [scoped] Default scoped slot with current state: center, zoom, rotation & etc.
-   */
-  export default {
-    name: 'vl-view',
-    mixins: [olCmp, projTransforms],
-    props,
-    computed,
-    methods,
-    watch,
+        value = this.pointToViewProj(value)
+        if (!isEqual(value, this.currentCenterViewProj)) {
+          this.$view.setCenter(value)
+        }
+      },
+      resolution (value) {
+        if (!this.$view || this.$view.getAnimating()) return
+
+        if (value !== this.currentResolution) {
+          this.$view.setResolution(value)
+        }
+      },
+      zoom (value) {
+        if (!this.$view || this.$view.getAnimating()) return
+
+        if (value !== this.currentZoom) {
+          this.$view.setZoom(value)
+        }
+      },
+      rotation (value) {
+        if (!this.$view || this.$view.getAnimating()) return
+
+        if (value !== this.currentRotation) {
+          this.$view.setRotation(value)
+        }
+      },
+      minZoom (value) {
+        if (!this.$view) return
+
+        if (value !== this.$view.getMinZoom()) {
+          this.$view.setMinZoom(value)
+        }
+      },
+      maxZoom (value) {
+        if (!this.$view) return
+
+        if (value !== this.$view.getMaxZoom()) {
+          this.$view.setMaxZoom(value)
+        }
+      },
+      ...makeWatchers([
+        'resolvedDataProjection',
+        'constrainRotation',
+        'enableRotation',
+        'extent',
+        'maxResolution',
+        'minResolution',
+        'projection',
+        'resolutions',
+        'zoomFactor',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
     stubVNode: {
       empty () {
-        return this.$options.name
+        return this.vmId
       },
     },
-    /**
-     * @this module:map/view
-     */
     created () {
-      Object.defineProperties(this, /** @lends module:map/view# */{
-        /**
-         * @type {View|undefined}
-         */
-        $view: {
-          enumerable: true,
-          get: () => this.$olObject,
-        },
-        $viewContainer: {
-          enumerable: true,
-          get: () => this.$services && this.$services.viewContainer,
-        },
-      })
+      this::defineServices()
     },
   }
 
+  function defineServices () {
+    Object.defineProperties(this, {
+      /**
+       * @type {ol/View~View|undefined}
+       */
+      $view: {
+        enumerable: true,
+        get: () => this.$olObject,
+      },
+      $viewContainer: {
+        enumerable: true,
+        get: () => this.$services && this.$services.viewContainer,
+      },
+    })
+  }
+
   /**
    * Subscribe to OpenLayers significant events
    * @return {void}
    * @private
    */
-  function subscribeToViewChanges () {
+  function subscribeToEvents () {
     hasView(this)
 
     const ft = 1000 / 60
@@ -349,7 +357,7 @@
     const zoom = resolution.pipe(
       mapObs(() => ({
         prop: 'zoom',
-        value: Math.round(this.$view.getZoom()),
+        value: this.$view.getZoom(),
       })),
       distinctUntilKeyChanged('value'),
     )
@@ -363,7 +371,10 @@
 
     this.subscribeTo(changes, ({ prop, value }) => {
       ++this.rev
-      this.$emit(`update:${prop}`, value)
+
+      this.$nextTick(() => {
+        this.$emit(`update:${prop}`, value)
+      })
     })
   }
 </script>
diff --git a/src/component/mapbox-source/source.vue b/src/component/mapbox-source/source.vue
index 8123cfee..1189fc9f 100644
--- a/src/component/mapbox-source/source.vue
+++ b/src/component/mapbox-source/source.vue
@@ -1,6 +1,6 @@
 <script>
-  import xyzSource from '../../mixin/xyz-source'
-  import { EPSG_3857, TILE_FORMAT } from '../../ol-ext/consts'
+  import { xyzSource } from '../../mixin'
+  import { EPSG_3857, TILE_FORMAT } from '../../ol-ext'
   import { coalesce } from '../../util/minilo'
 
   const MAPBOX_URL_TEMPLATE = 'https://{a-c}.tiles.mapbox.com/v4/{mapId}/{z}/{x}/{y}{tileNameSuffix}.{tileFormat}?access_token={accessToken}'
diff --git a/src/component/modify-interaction/interaction.vue b/src/component/modify-interaction/interaction.vue
index deba8e8e..41dd0d78 100644
--- a/src/component/modify-interaction/interaction.vue
+++ b/src/component/modify-interaction/interaction.vue
@@ -1,181 +1,181 @@
 <script>
   import { altKeyOnly, always, primaryAction } from 'ol/events/condition'
   import ModifyInteraction from 'ol/interaction/Modify'
-  import interaction from '../../mixin/interaction'
-  import stylesContainer from '../../mixin/styles-container'
-  import { createStyle, defaultEditStyle } from '../../ol-ext/style'
-  import { isCollection, isVectorSource } from '../../ol-ext/util'
-  import observableFromOlEvent from '../../rx-ext/from-ol-event'
-  import { hasInteraction } from '../../util/assert'
-  import { isFunction, mapValues } from '../../util/minilo'
+  import { interaction, stylesContainer } from '../../mixin'
+  import { createStyle, defaultEditStyle, isCollection, isVectorSource } from '../../ol-ext'
+  import { observableFromOlEvent } from '../../rx-ext'
+  import { assert, hasInteraction } from '../../util/assert'
+  import { mapValues } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import { makeWatchers } from '../../util/vue-helpers'
 
   /**
-   * @vueProps
+   * @vueProto
+   * @alias module:modify-interaction/interaction
+   * @title vl-interaction-modify
    */
-  const props = {
-    /**
-     * Source or collection identifier from IdentityMap.
-     * @type {String}
-     */
-    source: {
-      type: String,
-      required: true,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event will be
-     * considered to add or move a vertex to the sketch. Default is `ol.events.condition.primaryAction`.
-     * @type {function|undefined}
-     */
-    condition: {
-      type: Function,
-      default: primaryAction,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
-     * By default, `ol.events.condition.singleClick` with `ol.events.condition.altKeyOnly` results in a vertex deletion.
-     * @type {function|undefined}
-     */
-    deleteCondition: {
-      type: Function,
-      default: altKeyOnly,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether a new vertex can be added
-     * to the sketch features. Default is `ol.events.condition.always`.
-     * @type {function|undefined}
-     */
-    insertVertexCondition: {
-      type: Function,
-      default: always,
-    },
-    /**
-     * Pixel tolerance for considering the pointer close enough to a segment or vertex for editing.
-     * @type {number}
-     */
-    pixelTolerance: {
-      type: Number,
-      default: 10,
+  export default {
+    name: 'vl-interaction-modify',
+    mixins: [interaction, stylesContainer],
+    stubVNode: {
+      empty: false,
+      attrs () {
+        return {
+          id: this.vmId,
+          class: this.cmpName,
+        }
+      },
     },
-    /**
-     * Wrap the world horizontally on the sketch overlay.
-     * @type {boolean}
-     */
-    wrapX: {
-      type: Boolean,
-      default: false,
+    props: {
+      /**
+       * Source or collection identifier from IdentityMap.
+       * @type {String}
+       */
+      source: {
+        type: String,
+        required: true,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event will be
+       * considered to add or move a vertex to the sketch. Default is `ol.events.condition.primaryAction`.
+       * @type {function|undefined}
+       */
+      condition: {
+        type: Function,
+        default: primaryAction,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
+       * By default, `ol.events.condition.singleClick` with `ol.events.condition.altKeyOnly` results in a vertex deletion.
+       * @type {function|undefined}
+       */
+      deleteCondition: {
+        type: Function,
+        default: altKeyOnly,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether a new vertex can be added
+       * to the sketch features. Default is `ol.events.condition.always`.
+       * @type {function|undefined}
+       */
+      insertVertexCondition: {
+        type: Function,
+        default: always,
+      },
+      /**
+       * Pixel tolerance for considering the pointer close enough to a segment or vertex for editing.
+       * @type {number}
+       */
+      pixelTolerance: {
+        type: Number,
+        default: 10,
+      },
+      /**
+       * Wrap the world horizontally on the sketch overlay.
+       * @type {boolean}
+       */
+      wrapX: {
+        type: Boolean,
+        default: false,
+      },
     },
-  }
+    methods: {
+      /**
+       * @return {Promise<Modify>}
+       * @protected
+       */
+      async createInteraction () {
+        let sourceIdent = this.makeIdent(this.source)
+        let source = await this.$identityMap.get(sourceIdent, this.$options.INSTANCE_PROMISE_POOL)
+        assert(isVectorSource(source), `Source "${sourceIdent}" doesn't exists in the identity map.`)
+        assert(isCollection(source.getFeaturesCollection()),
+          `Source "${sourceIdent}" doesn't provide features collection.`)
 
-  /**
-   * @vueMethods
-   */
-  const methods = {
-    /**
-     * @return {Promise<Modify>}
-     * @protected
-     */
-    async createInteraction () {
-      let sourceIdent = this.makeIdent(this.source)
-      let source = await this.$identityMap.get(sourceIdent, this.$options.INSTANCE_PROMISE_POOL)
+        return new ModifyInteraction({
+          features: source.getFeaturesCollection(),
+          deleteCondition: this.deleteCondition,
+          insertVertexCondition: this.insertVertexCondition,
+          pixelTolerance: this.pixelTolerance,
+          style: this.createStyleFunc(),
+          wrapX: this.wrapX,
+        })
+      },
+      /**
+       * @return {function(feature: Feature): Style}
+       * @protected
+       */
+      getDefaultStyles () {
+        const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
 
-      if (isFunction(source.getFeatures)) {
-        let features = source.getFeatures()
-        if (isCollection(features)) {
-          source = features
+        return function __selectDefaultStyleFunc (feature) {
+          if (feature.getGeometry()) {
+            return defaultStyles[feature.getGeometry().getType()]
+          }
         }
-      }
-
-      return new ModifyInteraction({
-        source: isVectorSource(source) ? source : undefined,
-        features: isCollection(source) ? source : undefined,
-        deleteCondition: this.deleteCondition,
-        insertVertexCondition: this.insertVertexCondition,
-        pixelTolerance: this.pixelTolerance,
-        style: this.createStyleFunc(),
-        wrapX: this.wrapX,
-      })
-    },
-    /**
-     * @return {function(feature: Feature): Style}
-     * @protected
-     */
-    getDefaultStyles () {
-      const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
-
-      return function __selectDefaultStyleFunc (feature) {
-        if (feature.getGeometry()) {
-          return defaultStyles[feature.getGeometry().getType()]
+      },
+      /**
+       * @returns {Object}
+       * @protected
+       */
+      getServices () {
+        return mergeDescriptors(
+          this::interaction.methods.getServices(),
+          this::stylesContainer.methods.getServices(),
+        )
+      },
+      /**
+       * @return {Interaction|undefined}
+       * @protected
+       */
+      getStyleTarget () {
+        return this.$interaction
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this::interaction.methods.mount()
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this::interaction.methods.unmount()
+      },
+      /**
+       * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
+       * @return {void}
+       * @protected
+       */
+      setStyle (styles) {
+        if (styles !== this._styles) {
+          this._styles = styles
+          this.scheduleRecreate()
         }
-      }
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::interaction.methods.subscribeAll()
+        this::subscribeToInteractionChanges()
+      },
     },
-    /**
-     * @returns {Object}
-     * @protected
-     */
-    getServices () {
-      return mergeDescriptors(
-        this::interaction.methods.getServices(),
-        this::stylesContainer.methods.getServices(),
-      )
+    watch: {
+      ...makeWatchers([
+        'source',
+        'condition',
+        'deleteCondition',
+        'insertVertexCondition',
+        'pixelTolerance',
+        'wrapX',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
     },
-    /**
-     * @return {Interaction|undefined}
-     * @protected
-     */
-    getStyleTarget () {
-      return this.$interaction
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this::interaction.methods.mount()
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this::interaction.methods.unmount()
-    },
-    /**
-     * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
-     * @return {void}
-     * @protected
-     */
-    setStyle (styles) {
-      if (styles !== this._styles) {
-        this._styles = styles
-        this.scheduleRefresh()
-      }
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToInteractionChanges()
-    },
-  }
-
-  const watch = makeWatchers(['source'], () => function () {
-    this.scheduleRecreate()
-  })
-
-  /**
-   * @vueProto
-   * @alias module:modify-interaction/interaction
-   * @title vl-interaction-modify
-   */
-  export default {
-    name: 'vl-interaction-modify',
-    mixins: [interaction, stylesContainer],
-    props,
-    methods,
-    watch,
   }
 
   /**
@@ -187,7 +187,10 @@
     const modifyEvents = observableFromOlEvent(this.$interaction, ['modifystart', 'modifyend'])
     this.subscribeTo(modifyEvents, evt => {
       ++this.rev
-      this.$emit(evt.type, evt)
+
+      this.$nextTick(() => {
+        this.$emit(evt.type, evt)
+      })
     })
   }
 </script>
diff --git a/src/component/multi-line-string-geom/geom.vue b/src/component/multi-line-string-geom/geom.vue
index 694a9f83..8102bff6 100644
--- a/src/component/multi-line-string-geom/geom.vue
+++ b/src/component/multi-line-string-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import MultiLineString from 'ol/geom/MultiLineString'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {}
diff --git a/src/component/multi-point-geom/geom.vue b/src/component/multi-point-geom/geom.vue
index 96274d83..678c7ce2 100644
--- a/src/component/multi-point-geom/geom.vue
+++ b/src/component/multi-point-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import MultiPoint from 'ol/geom/MultiPoint'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {}
diff --git a/src/component/multi-polygon-geom/geom.vue b/src/component/multi-polygon-geom/geom.vue
index a0f7926d..e5151c81 100644
--- a/src/component/multi-polygon-geom/geom.vue
+++ b/src/component/multi-polygon-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import MultiPolygon from 'ol/geom/MultiPolygon'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {}
diff --git a/src/component/osm-source/source.vue b/src/component/osm-source/source.vue
index 3f5a3a0b..96db5696 100644
--- a/src/component/osm-source/source.vue
+++ b/src/component/osm-source/source.vue
@@ -1,6 +1,6 @@
 <script>
   import OSMSource from 'ol/source/OSM'
-  import xyzSource from '../../mixin/xyz-source'
+  import { xyzSource } from '../../mixin'
 
   const OSM_ATTRIBUTIONS = '&copy; <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors.'
   const OSM_URL_TEMPLATE = 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png'
diff --git a/src/component/overlay/overlay.vue b/src/component/overlay/overlay.vue
index b9063846..be4b669a 100644
--- a/src/component/overlay/overlay.vue
+++ b/src/component/overlay/overlay.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :id="[$options.name, id].join('-')" :class="classes">
+  <div :id="vmId" :class="classes">
     <slot :id="id" :position="position" :offset="offset" :positioning="positioning"/>
   </div>
 </template>
@@ -7,20 +7,13 @@
 <script>
   import Overlay from 'ol/Overlay'
   import { merge as mergeObs } from 'rxjs/observable'
-  import uuid from 'uuid/v4'
-  import olCmp from '../../mixin/ol-cmp'
-  import projTransforms from '../../mixin/proj-transforms'
-  import useMapCmp from '../../mixin/use-map-cmp'
-  import { OVERLAY_POSITIONING } from '../../ol-ext/consts'
-  import observableFromOlChangeEvent from '../../rx-ext/from-ol-change-event'
+  import { olCmp, projTransforms, useMapCmp } from '../../mixin'
+  import { getOverlayId, initializeOverlay, OVERLAY_POSITIONING, setOverlayId } from '../../ol-ext'
+  import { observableFromOlChangeEvent } from '../../rx-ext'
   import { hasOverlay } from '../../util/assert'
   import { isEqual, identity } from '../../util/minilo'
 
   const props = {
-    id: {
-      type: [String, Number],
-      default: () => uuid(),
-    },
     offset: {
       type: Array,
       default: () => [0, 0],
@@ -57,11 +50,9 @@
       default: 20,
     },
     autoPanAnimation: Object,
+    className: String,
   }
 
-  /**
-   * @vueComputed
-   */
   const computed = {
     positionViewProj () {
       if (this.rev && this.$overlay) {
@@ -75,22 +66,19 @@
     },
     classes () {
       return [
-        this.$options.name,
+        this.cmpName,
         this.visible ? 'visible' : undefined,
       ].filter(identity)
     },
   }
 
-  /**
-   * @vueMethods
-   */
-  const methods = /** @lends module:overlay/overlay# */{
+  const methods = {
     /**
-     * @return {Overlay}
+     * @return {module:ol/Overlay~Overlay}
      * @protected
      */
     createOlObject () {
-      return new Overlay({
+      const overlay = new Overlay({
         id: this.id,
         offset: this.offset,
         position: this.pointToViewProj(this.position),
@@ -100,7 +88,12 @@
         autoPan: this.autoPan,
         autoPanMargin: this.autoPanMargin,
         autoPanAnimation: this.autoPanAnimation,
+        className: this.className,
       })
+
+      initializeOverlay(overlay, this.id)
+
+      return overlay
     },
     /**
      * @return {void}
@@ -128,6 +121,7 @@
       this.unsubscribeAll()
       this.$overlay.setElement(undefined)
       this.$overlaysContainer && this.$overlaysContainer.removeOverlay(this.$overlay)
+
       this.visible = false
     },
     /**
@@ -140,6 +134,11 @@
   }
 
   const watch = {
+    id (value) {
+      if (!this.$overlay || value === getOverlayId(this.$overlay)) return
+
+      setOverlayId(this.$overlay, value)
+    },
     offset (value) {
       if (this.$overlay && !isEqual(value, this.$overlay.getOffset())) {
         this.$overlay.setOffset(value)
@@ -147,7 +146,7 @@
     },
     position (value) {
       value = this.pointToViewProj(value)
-      if (this.$overlay && !isEqual(value, this.positionViewProj)) {
+      if (this.$overlay && !isEqual(value, this.$overlay.getPosition())) {
         this.$overlay.setPosition(value)
       }
     },
@@ -163,11 +162,6 @@
     },
   }
 
-  /**
-   * @alias module:overlay/overlay
-   * @title vl-overlay
-   * @vueProto
-   */
   export default {
     name: 'vl-overlay',
     mixins: [olCmp, useMapCmp, projTransforms],
@@ -176,9 +170,9 @@
     methods,
     watch,
     created () {
-      Object.defineProperties(this, /** @lends module:overlay/overlay# */{
+      Object.defineProperties(this, {
         /**
-         * @type {Overlay|undefined}
+         * @type {module:ol/Overlay~Overlay|undefined}
          */
         $overlay: {
           enumerable: true,
@@ -212,19 +206,20 @@
   function subscribeToOverlayChanges () {
     hasOverlay(this)
 
-    const ft = 1000 / 60
     const changes = mergeObs(
-      observableFromOlChangeEvent(this.$overlay, 'position', true, ft,
-        () => this.pointToDataProj(this.$overlay.getPosition())),
+      observableFromOlChangeEvent(this.$overlay, 'position', true, undefined, () => this.pointToDataProj(this.$overlay.getPosition())),
       observableFromOlChangeEvent(this.$overlay, [
         'offset',
         'positioning',
-      ], true, ft),
+      ], true),
     )
 
     this.subscribeTo(changes, ({ prop, value }) => {
       ++this.rev
-      this.$emit(`update:${prop}`, value)
+
+      this.$nextTick(() => {
+        this.$emit(`update:${prop}`, value)
+      })
     })
   }
 </script>
diff --git a/src/component/point-geom/geom.vue b/src/component/point-geom/geom.vue
index 60c35048..183e623d 100644
--- a/src/component/point-geom/geom.vue
+++ b/src/component/point-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import Point from 'ol/geom/Point'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {
diff --git a/src/component/polygon-geom/geom.vue b/src/component/polygon-geom/geom.vue
index 3549d094..b0d4d7b7 100644
--- a/src/component/polygon-geom/geom.vue
+++ b/src/component/polygon-geom/geom.vue
@@ -1,7 +1,7 @@
 <script>
   import Polygon from 'ol/geom/Polygon'
-  import geometry from '../../mixin/geometry'
-  import { GEOMETRY_TYPE } from '../../ol-ext/consts'
+  import { geometry } from '../../mixin'
+  import { GEOMETRY_TYPE } from '../../ol-ext'
   import { constant } from '../../util/minilo'
 
   const props = {}
diff --git a/src/component/reg-shape-style/style.vue b/src/component/reg-shape-style/style.vue
index 763389d0..97cc0a6c 100644
--- a/src/component/reg-shape-style/style.vue
+++ b/src/component/reg-shape-style/style.vue
@@ -1,8 +1,7 @@
 <script>
-  import Vue from 'vue'
   import RegularShape from 'ol/style/RegularShape'
-  import imageStyle from '../../mixin/image-style'
-  import withFillStrokeStyle from '../../mixin/with-fill-stroke-style'
+  import Vue from 'vue'
+  import { imageStyle, withFillStrokeStyle } from '../../mixin'
   import { isEqual } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
 
diff --git a/src/component/select-interaction/interaction.vue b/src/component/select-interaction/interaction.vue
index a2222562..60f44be5 100644
--- a/src/component/select-interaction/interaction.vue
+++ b/src/component/select-interaction/interaction.vue
@@ -1,344 +1,305 @@
 <template>
-  <i :class="[$options.name]" style="display: none !important;">
-    <slot :features="features"/>
+  <i :id="vmId" :class="cmpName" style="display: none !important;">
+    <slot :features="featuresDataProj"/>
   </i>
 </template>
 
 <script>
+  import debounce from 'debounce-promise'
   import { never, shiftKeyOnly, singleClick } from 'ol/events/condition'
   import Feature from 'ol/Feature'
   import SelectInteraction from 'ol/interaction/Select'
   import Vue from 'vue'
-  import interaction from '../../mixin/interaction'
-  import projTransforms from '../../mixin/proj-transforms'
-  import stylesContainer from '../../mixin/styles-container'
-  import { getFeatureId } from '../../ol-ext/feature'
-  import { createStyle, defaultEditStyle } from '../../ol-ext/style'
-  import observableFromOlEvent from '../../rx-ext/from-ol-event'
+  import { merge as mergeObs } from 'rxjs/observable'
+  import { map as mapOp } from 'rxjs/operators'
+  import { interaction, projTransforms, stylesContainer, featuresContainer } from '../../mixin'
+  import { getFeatureId, createStyle, defaultEditStyle, getLayerId, initializeFeature } from '../../ol-ext'
+  import { observableFromOlEvent } from '../../rx-ext'
   import { hasInteraction, hasMap } from '../../util/assert'
-  import { constant, difference, forEach, isFunction, mapValues, stubArray } from '../../util/minilo'
+  import { constant, difference, forEach, isEqual, isFunction, mapValues, stubArray } from '../../util/minilo'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
   import { makeWatchers } from '../../util/vue-helpers'
 
-  /**
-   * @vueProps
-   */
-  const props = {
-    /**
-     * A function that takes an `ol.Feature` and an `ol.layer.Layer` and returns `true` if the feature may be selected or `false` otherwise.
-     * @type {function|undefined}
-     */
-    filter: {
-      type: Function,
-      default: constant(true),
-    },
-    /**
-     * Hit-detection tolerance. Pixels inside the radius around the given position will be checked for features.
-     * This only works for the canvas renderer and not for WebGL.
-     * @type {number}
-     */
-    hitTolerance: {
-      type: Number,
-      default: 0,
-    },
-    /**
-     * A boolean that determines if the default behaviour should select only single features or all (overlapping)
-     * features at the clicked map position.
-     * @type {boolean}
-     */
-    multi: {
-      type: Boolean,
-      default: false,
-    },
-    /**
-     * Selected features as array of GeoJSON features with coordinates in the map view projection.
-     * @type {string[]|number[]|Object[]}
-     */
-    features: {
-      type: Array,
-      default: stubArray,
-    },
-    /**
-     * Wrap the world horizontally on the selection overlay.
-     * @type {boolean}
-     */
-    wrapX: {
-      type: Boolean,
-      default: true,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should
-     * be handled. By default, this is `ol.events.condition.never`. Use this if you want to use different events
-     * for `add` and `remove` instead of `toggle`.
-     * @type {function|undefined}
-     */
-    addCondition: {
-      type: Function,
-      default: never,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
-     * This is the event for the selected features as a whole. By default, this is `ol.events.condition.singleClick`.
-     * Clicking on a feature selects that feature and removes any that were in the selection. Clicking outside any feature
-     * removes all from the selection.
-     * @type {function|undefined}
-     */
-    condition: {
-      type: Function,
-      default: singleClick,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
-     * By default, this is `ol.events.condition.never`. Use this if you want to use different events for `add` and `remove`
-     * instead of `toggle`.
-     * @type {function|undefined}
-     */
-    removeCondition: {
-      type: Function,
-      default: never,
-    },
-    /**
-     * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
-     * This is in addition to the `condition` event. By default, `ol.events.condition.shiftKeyOnly`, i.e. pressing `shift`
-     * as well as the `condition` event, adds that feature to the current selection if it is not currently selected,
-     * and removes it if it is.
-     * @type {function|undefined}
-     */
-    toggleCondition: {
-      type: Function,
-      default: shiftKeyOnly,
-    },
-  }
-
-  /**
-   * @vueComputed
-   */
-  const computed = {}
-
-  /**
-   * @vueMethods
-   */
-  const methods = {
-    /**
-     * @return {Select}
-     * @protected
-     */
-    createInteraction () {
-      return new SelectInteraction({
-        multi: this.multi,
-        wrapX: this.wrapX,
-        filter: this.filter,
-        style: this.createStyleFunc(),
-        addCondition: this.addCondition,
-        condition: this.condition,
-        removeCondition: this.removeCondition,
-        toggleCondition: this.toggleCondition,
-      })
-    },
-    /**
-     * @return {function(feature: Feature): Style}
-     * @protected
-     */
-    getDefaultStyles () {
-      const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
-
-      return function __selectDefaultStyleFunc (feature) {
-        if (feature.getGeometry()) {
-          return defaultStyles[feature.getGeometry().getType()]
+  export default {
+    name: 'vl-interaction-select',
+    mixins: [interaction, featuresContainer, stylesContainer, projTransforms],
+    stubVNode: {
+      empty: false,
+      attrs () {
+        return {
+          id: this.vmId,
+          class: this.cmpName,
         }
-      }
-    },
-    /**
-     * @return {Feature[]}
-     */
-    getFeatures () {
-      return (this.$interaction && this.$interaction.getFeatures().getArray()) || []
-    },
-    /**
-     * @returns {Object}
-     * @protected
-     */
-    getServices () {
-      return mergeDescriptors(
-        this::interaction.methods.getServices(),
-        this::stylesContainer.methods.getServices(),
-      )
-    },
-    /**
-     * @return {Interaction|undefined}
-     * @protected
-     */
-    getStyleTarget () {
-      return this.$interaction
+      },
     },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this::interaction.methods.mount()
-      this.features.forEach(this.select)
+    props: {
+      /**
+       * A function that takes an `ol.Feature` and an `ol.layer.Layer` and returns `true` if the feature may be selected or `false` otherwise.
+       * @type {function|undefined}
+       */
+      filter: {
+        type: Function,
+        default: constant(true),
+      },
+      /**
+       * A list of layers from which features should be selected. Alternatively, a filter function can be provided.
+       * @type {string[]|function|undefined}
+       */
+      layers: {
+        type: [Array, Function],
+        default: undefined,
+      },
+      /**
+       * Hit-detection tolerance. Pixels inside the radius around the given position will be checked for features.
+       * This only works for the canvas renderer and not for WebGL.
+       * @type {number}
+       */
+      hitTolerance: {
+        type: Number,
+        default: 0,
+      },
+      /**
+       * A boolean that determines if the default behaviour should select only single features or all (overlapping)
+       * features at the clicked map position.
+       * @type {boolean}
+       */
+      multi: {
+        type: Boolean,
+        default: false,
+      },
+      /**
+       * Selected features as array of GeoJSON features with coordinates in the map view projection.
+       * @type {string[]|number[]|Object[]}
+       */
+      features: {
+        type: Array,
+        default: stubArray,
+      },
+      /**
+       * Wrap the world horizontally on the selection overlay.
+       * @type {boolean}
+       */
+      wrapX: {
+        type: Boolean,
+        default: true,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should
+       * be handled. By default, this is `ol.events.condition.never`. Use this if you want to use different events
+       * for `add` and `remove` instead of `toggle`.
+       * @type {function|undefined}
+       */
+      addCondition: {
+        type: Function,
+        default: never,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
+       * This is the event for the selected features as a whole. By default, this is `ol.events.condition.singleClick`.
+       * Clicking on a feature selects that feature and removes any that were in the selection. Clicking outside any feature
+       * removes all from the selection.
+       * @type {function|undefined}
+       */
+      condition: {
+        type: Function,
+        default: singleClick,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
+       * By default, this is `ol.events.condition.never`. Use this if you want to use different events for `add` and `remove`
+       * instead of `toggle`.
+       * @type {function|undefined}
+       */
+      removeCondition: {
+        type: Function,
+        default: never,
+      },
+      /**
+       * A function that takes an `ol.MapBrowserEvent` and returns a boolean to indicate whether that event should be handled.
+       * This is in addition to the `condition` event. By default, `ol.events.condition.shiftKeyOnly`, i.e. pressing `shift`
+       * as well as the `condition` event, adds that feature to the current selection if it is not currently selected,
+       * and removes it if it is.
+       * @type {function|undefined}
+       */
+      toggleCondition: {
+        type: Function,
+        default: shiftKeyOnly,
+      },
     },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.unselectAll()
-      this::interaction.methods.unmount()
+    computed: {
+      layerFilter () {
+        return Array.isArray(this.layers)
+          ? layer => this.layers.includes(getLayerId(layer))
+          : this.layers
+      },
     },
-    /**
-     * @param {Object|Vue|Feature|string|number} feature
-     * @return {void}
-     * @throws {Error}
-     */
-    select (feature) {
-      hasMap(this)
-      hasInteraction(this)
-
-      let id = getFeatureId(feature)
-      if (!id) {
-        throw new Error('Undefined feature id')
-      }
-      if (feature instanceof Vue) {
-        feature = feature.$feature
-      }
-
-      const selectedIds = this.$features.map(getFeatureId)
-      if (selectedIds.includes(id)) return
-
-      if (!(feature instanceof Feature)) {
-        feature = undefined
-        forEach(this.$map.getLayers().getArray(), layer => {
-          const source = layer.getSource()
-
-          if (source && isFunction(source.getFeatureById)) {
-            feature = source.getFeatureById(id)
-          }
-
-          return !feature
+    methods: {
+      /**
+       * @return {Select}
+       * @protected
+       */
+      createInteraction () {
+        return new SelectInteraction({
+          features: this.$featuresCollection,
+          multi: this.multi,
+          wrapX: this.wrapX,
+          filter: this.filter,
+          layers: this.layerFilter,
+          style: this.createStyleFunc(),
+          addCondition: this.addCondition,
+          condition: this.condition,
+          removeCondition: this.removeCondition,
+          toggleCondition: this.toggleCondition,
         })
-      }
-
-      feature && this.$interaction.getFeatures().push(feature)
-    },
-    /**
-     * @param {Object|Vue|Feature|string|number} feature
-     * @return {void}
-     */
-    unselect (feature) {
-      hasInteraction(this)
+      },
+      /**
+       * @return {function(feature: Feature): Style}
+       * @protected
+       */
+      getDefaultStyles () {
+        const defaultStyles = mapValues(defaultEditStyle(), styles => styles.map(createStyle))
 
-      let id = getFeatureId(feature)
-      if (!id) {
-        throw new Error('Undefined feature id')
-      }
-      if (feature instanceof Vue) {
-        feature = feature.$feature
-      }
+        return function __selectDefaultStyleFunc (feature) {
+          if (feature.getGeometry()) {
+            return defaultStyles[feature.getGeometry().getType()]
+          }
+        }
+      },
+      /**
+       * @returns {Object}
+       * @protected
+       */
+      getServices () {
+        return mergeDescriptors(
+          this::interaction.methods.getServices(),
+          this::stylesContainer.methods.getServices(),
+        )
+      },
+      /**
+       * @return {Interaction|undefined}
+       * @protected
+       */
+      getStyleTarget () {
+        return this.$interaction
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this::interaction.methods.mount()
+        this.features.forEach(this.select)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.unselectAll()
+        this::interaction.methods.unmount()
+      },
+      /**
+       * @param {Object|Vue|Feature|string|number} feature
+       * @return {void}
+       * @throws {Error}
+       */
+      select (feature) {
+        hasMap(this)
 
-      const selectedIds = this.$features.map(getFeatureId)
-      const idx = selectedIds.findIndex(x => x === id)
+        if (feature instanceof Vue) {
+          feature = feature.$feature
+        }
 
-      if (idx !== -1) {
-        this.$interaction.getFeatures().removeAt(idx)
-      }
-    },
-    /**
-     * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
-     * @return {void}
-     * @protected
-     */
-    setStyle (styles) {
-      if (styles !== this._styles) {
-        this._styles = styles
-        this.scheduleRefresh()
-      }
-    },
-    /**
-     * @return {Promise}
-     */
-    refresh () {
-      return Promise.all([
-        new Promise(resolve => {
-          if (this.$interaction) {
-            const featuresCollection = this.$interaction.getFeatures()
-            featuresCollection.once('change', () => resolve())
-            featuresCollection.changed()
-          } else {
-            resolve()
+        if (!(feature instanceof Feature)) {
+          const featureId = getFeatureId(feature)
+          if (!featureId) {
+            throw new Error('Undefined feature id')
           }
-        }),
-        this::interaction.methods.refresh(),
-      ])
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    subscribeAll () {
-      this::subscribeToInteractionChanges()
-    },
-    /**
-     * Removes all features from selection.
-     * @return {void}
-     */
-    unselectAll () {
-      hasInteraction(this)
-      this.$interaction.getFeatures().clear()
-    },
-  }
 
-  const watch = {
-    ...makeWatchers([
-      'filter',
-      'hitTolerance',
-      'multi',
-      'wrapX',
-      'addCondition',
-      'condition',
-      'removeCondition',
-      'toggleCondition',
-    ], () => function () { this.scheduleRecreate() }),
-    features (value) {
-      if (!this.$interaction) return
+          feature = undefined
+          forEach(this.$map.getLayers().getArray(), layer => {
+            if (this.layerFilter && !this.layerFilter(layer)) {
+              return false
+            }
 
-      let diffById = (a, b) => getFeatureId(a) === getFeatureId(b)
-      let forSelect = difference(value, this.$features, diffById)
-      let forUnselect = difference(this.$features, value, diffById)
+            const source = layer.getSource()
+            if (source && isFunction(source.getFeatureById)) {
+              feature = source.getFeatureById(featureId)
+            }
 
-      forSelect.forEach(this.select)
-      forUnselect.forEach(this.unselect)
-    },
-  }
+            return !feature
+          })
+        }
 
-  /**
-   * @vueProto
-   * @alias module:select-interaction/interaction
-   * @title vl-interaction-select
-   */
-  export default {
-    name: 'vl-interaction-select',
-    mixins: [interaction, stylesContainer, projTransforms],
-    props,
-    computed,
-    methods,
-    watch,
-    stubVNode: {
-      empty: false,
-      attrs () {
-        return {
-          class: this.$options.name,
+        if (!feature) return
+
+        this.addFeature(feature)
+      },
+      /**
+       * @param {Object|Vue|Feature|string|number} feature
+       * @return {void}
+       */
+      unselect (feature) {
+        this.removeFeature(feature)
+      },
+      /**
+       * Removes all features from selection.
+       * @return {void}
+       */
+      unselectAll () {
+        this.clearFeatures()
+      },
+      /**
+       * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|function(feature: Feature): Style|Vue|undefined} styles
+       * @return {void}
+       * @protected
+       */
+      setStyle (styles) {
+        if (styles !== this._styles) {
+          this._styles = styles
+          this.scheduleRefresh()
         }
       },
+      /**
+       * @return {void}
+       * @protected
+       */
+      subscribeAll () {
+        this::interaction.methods.subscribeAll()
+        this::subscribeToInteractionChanges()
+      },
     },
-    created () {
-      Object.defineProperties(this, {
-        $features: {
-          enumerable: true,
-          get: this.getFeatures,
+    watch: {
+      features: {
+        deep: true,
+        handler (features) {
+          if (!this.$interaction || isEqual(features, this.featuresDataProj)) return
+
+          features = features.slice().map(feature => initializeFeature({ ...feature }))
+          this.addFeatures(features)
+
+          let forUnselect = difference(this.getFeatures(), features, (a, b) => getFeatureId(a) === getFeatureId(b))
+          this.removeFeatures(forUnselect)
         },
-      })
+      },
+      featuresDataProj: {
+        deep: true,
+        handler: debounce(function (features) {
+          this.$emit('update:features', features)
+        }, 1000 / 60),
+      },
+      ...makeWatchers([
+        'filter',
+        'hitTolerance',
+        'multi',
+        'wrapX',
+        'addCondition',
+        'condition',
+        'removeCondition',
+        'toggleCondition',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
     },
   }
 
@@ -349,17 +310,20 @@
   function subscribeToInteractionChanges () {
     hasInteraction(this)
 
-    const events = observableFromOlEvent(this.$interaction, 'select')
-
-    this.subscribeTo(
-      events,
-      ({ selected, deselected, mapBrowserEvent }) => {
-        ++this.rev
+    const select = observableFromOlEvent(this.$featuresCollection, 'add')
+      .pipe(
+        mapOp(({ element }) => ({ type: 'select', feature: element }))
+      )
+    const unselect = observableFromOlEvent(this.$featuresCollection, 'remove')
+      .pipe(
+        mapOp(({ element }) => ({ type: 'unselect', feature: element }))
+      )
+    const events = mergeObs(select, unselect)
 
-        deselected.forEach(feature => this.$emit('unselect', { feature, mapBrowserEvent }))
-        selected.forEach(feature => this.$emit('select', { feature, mapBrowserEvent }))
-        this.$emit('update:features', this.$features.map(::this.writeFeatureInDataProj))
-      },
-    )
+    this.subscribeTo(events, evt => {
+      this.$nextTick(() => {
+        this.$emit(evt.type, evt.feature)
+      })
+    })
   }
 </script>
diff --git a/src/component/snap-interaction/interaction.vue b/src/component/snap-interaction/interaction.vue
index c5e5bb9b..082af1c2 100644
--- a/src/component/snap-interaction/interaction.vue
+++ b/src/component/snap-interaction/interaction.vue
@@ -1,6 +1,6 @@
 <script>
   import SnapInteraction from 'ol/interaction/Snap'
-  import interaction from '../../mixin/interaction'
+  import { interaction } from '../../mixin'
   import { makeWatchers } from '../../util/vue-helpers'
 
   /**
diff --git a/src/component/sputnik-source/source.vue b/src/component/sputnik-source/source.vue
index 1a5f6b36..b283c0ce 100644
--- a/src/component/sputnik-source/source.vue
+++ b/src/component/sputnik-source/source.vue
@@ -1,5 +1,5 @@
 <script>
-  import xyzSource from '../../mixin/xyz-source'
+  import { xyzSource } from '../../mixin'
 
   /**
    * Layer source to work with Sputnik.ru tile server.
diff --git a/src/component/stamen-source/source.vue b/src/component/stamen-source/source.vue
index b20522ec..50a0b91d 100644
--- a/src/component/stamen-source/source.vue
+++ b/src/component/stamen-source/source.vue
@@ -1,6 +1,6 @@
 <script>
   import StamenSource from 'ol/source/Stamen'
-  import xyzSource from '../../mixin/xyz-source'
+  import { xyzSource } from '../../mixin'
 
   const props = {
     /**
diff --git a/src/component/stroke-style/style.vue b/src/component/stroke-style/style.vue
index c2afe407..9aac5880 100644
--- a/src/component/stroke-style/style.vue
+++ b/src/component/stroke-style/style.vue
@@ -1,6 +1,6 @@
 <script>
   import Stroke from 'ol/style/Stroke'
-  import style from '../../mixin/style'
+  import { style } from '../../mixin'
   import { isEqual } from '../../util/minilo'
 
   const props = {
diff --git a/src/component/style-box/style.vue b/src/component/style-box/style.vue
index fc00d749..4e716630 100644
--- a/src/component/style-box/style.vue
+++ b/src/component/style-box/style.vue
@@ -1,10 +1,9 @@
 <script>
-  import Vue from 'vue'
   import Style from 'ol/style/Style'
-  import style from '../../mixin/style'
-  import withFillStrokeStyle from '../../mixin/with-fill-stroke-style'
-  import mergeDescriptors from '../../util/multi-merge-descriptors'
+  import Vue from 'vue'
+  import { style, withFillStrokeStyle } from '../../mixin'
   import { isEqual } from '../../util/minilo'
+  import mergeDescriptors from '../../util/multi-merge-descriptors'
 
   /**
    * Style box component.
@@ -125,22 +124,5 @@
     props,
     methods,
     watch,
-    created () {
-      /**
-       * @type {Image|undefined}
-       * @private
-       */
-      this._image = undefined
-      /**
-       * @type {Text|undefined}
-       * @private
-       */
-      this._text = undefined
-      /**
-       * @type {Geometry|undefined}
-       * @private
-       */
-      this._geometry = undefined
-    },
   }
 </script>
diff --git a/src/component/style-func/style.vue b/src/component/style-func/style.vue
index af746dc2..f683209b 100644
--- a/src/component/style-func/style.vue
+++ b/src/component/style-func/style.vue
@@ -1,6 +1,6 @@
 <script>
-  import style from '../../mixin/style'
-  import stylesContainer from '../../mixin/styles-container'
+  import { Style } from 'ol/style'
+  import { style, stylesContainer } from '../../mixin'
   import { hasMap } from '../../util/assert'
   import { warn } from '../../util/log'
   import { isFunction, noop } from '../../util/minilo'
@@ -11,121 +11,114 @@
    * Plays the role of both a style that mounts itself to style target component (vl-layer-vector, vl-feature & etc.)
    * and style target for inner style containers (vl-style-box) as fallback style.
    */
-
-  const props = {
-    /**
-     * @type {function(): function(feature: Feature): Style}
-     */
-    factory: {
-      type: Function,
-      required: true,
+  export default {
+    name: 'vl-style-func',
+    mixins: [style, stylesContainer],
+    stubVNode: {
+      empty: false,
+      attrs () {
+        return {
+          id: this.vmId,
+          class: this.cmpName,
+        }
+      },
     },
-  }
-
-  const computed = {
-    styleFunc () {
-      let func = this.factory()
-      if (!isFunction(func)) {
-        if (process.env.NODE_ENV !== 'production') {
-          warn(`Factory returned a value not of Function type, fallback style will be used`)
+    props: {
+      /**
+       * @type {function(): function(feature: Feature): Style}
+       */
+      factory: {
+        type: Function,
+        required: true,
+      },
+    },
+    computed: {
+      styleFunc () {
+        let func = this.factory()
+        if (!isFunction(func)) {
+          if (process.env.NODE_ENV !== 'production') {
+            warn(`Factory returned a value not of Function type, fallback style will be used`)
+          }
+          func = noop
         }
-        func = noop
-      }
 
-      return func
+        return func
+      },
     },
-  }
+    methods: {
+      /**
+       * @return {function(feature: Feature): Style}
+       * @protected
+       */
+      createStyle () {
+        hasMap(this)
+        // user provided style function
+        const providedStyleFunc = this.styleFunc
+        // fallback style function made from inner style containers
+        const fallbackStyleFunc = this.createStyleFunc()
 
-  const methods = {
-    /**
-     * @return {function(feature: Feature): Style}
-     * @protected
-     */
-    createStyle () {
-      hasMap(this)
-      // user provided style function
-      const providedStyleFunc = this.styleFunc
-      // fallback style function made from inner style containers
-      const fallbackStyleFunc = this.createStyleFunc()
-
-      return function __styleFunc (feature, resolution) {
-        const styles = providedStyleFunc(feature, resolution)
-        // not empty or null style
-        if (
-          styles === null ||
-          (Array.isArray(styles) && styles.length)
-        ) {
-          return styles
+        return function __styleFunc (feature, resolution) {
+          const styles = providedStyleFunc(feature, resolution)
+          // not empty or null style
+          if (
+            styles === null ||
+            (Array.isArray(styles) && styles.length) ||
+            styles instanceof Style
+          ) {
+            return styles
+          }
+          return fallbackStyleFunc(feature, resolution)
         }
-        return fallbackStyleFunc(feature, resolution)
-      }
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this.$stylesContainer && this.$stylesContainer.addStyle(this)
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.$stylesContainer && this.$stylesContainer.removeStyle(this)
-    },
-    /**
-     * @returns {Object}
-     * @protected
-     */
-    getServices () {
-      const vm = this
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this.$stylesContainer && this.$stylesContainer.addStyle(this)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.$stylesContainer && this.$stylesContainer.removeStyle(this)
+      },
+      /**
+       * @returns {Object}
+       * @protected
+       */
+      getServices () {
+        const vm = this
 
-      return mergeDescriptors(this::style.methods.getServices(), {
-        get stylesContainer () { return vm },
-      })
+        return mergeDescriptors(this::style.methods.getServices(), {
+          get stylesContainer () { return vm },
+        })
+      },
+      /**
+       * Overrides stylesContainer `setStyle` method
+       * @param {Array<{ style: Style, condition: (function|boolean|undefined) }>|function(feature: Feature): Style|Vue|undefined} styles
+       * @return {void}
+       */
+      setStyle (styles) {
+        if (styles !== this._styles) {
+          // simply save all inner styles and
+          // use them later in style function as fallback
+          this._styles = styles
+          this.scheduleRefresh()
+        }
+      },
+      /**
+       * @return {Promise}
+       */
+      refresh () {
+        // recreate style
+        return this.recreate()
+      },
     },
-    /**
-     * Overrides stylesContainer `setStyle` method
-     * @param {Array<{ style: Style, condition: (function|boolean|undefined) }>|function(feature: Feature): Style|Vue|undefined} styles
-     * @return {void}
-     */
-    setStyle (styles) {
-      if (styles !== this._styles) {
-        // simply save all inner styles and
-        // use them later in style function as fallback
-        this._styles = styles
+    watch: {
+      factory () {
         this.scheduleRefresh()
-      }
-    },
-    /**
-     * @return {Promise}
-     */
-    refresh () {
-      // recreate style
-      return this.recreate()
-    },
-  }
-
-  const watch = {
-    factory () {
-      this.scheduleRefresh()
-    },
-  }
-
-  export default {
-    name: 'vl-style-func',
-    mixins: [style, stylesContainer],
-    props,
-    computed,
-    methods,
-    watch,
-    stubVNode: {
-      empty: false,
-      attrs () {
-        return {
-          class: this.$options.name,
-        }
       },
     },
   }
diff --git a/src/component/text-style/style.vue b/src/component/text-style/style.vue
index 7058628c..9fed04a5 100644
--- a/src/component/text-style/style.vue
+++ b/src/component/text-style/style.vue
@@ -1,8 +1,7 @@
 <script>
   import Text from 'ol/style/Text'
-  import style from '../../mixin/style'
+  import { style, withFillStrokeStyle } from '../../mixin'
   import { isEqual } from '../../util/minilo'
-  import withFillStrokeStyle from '../../mixin/with-fill-stroke-style'
   import mergeDescriptors from '../../util/multi-merge-descriptors'
 
   const props = {
@@ -91,6 +90,12 @@
         this.scheduleRefresh()
       }
     },
+    placement (value) {
+      if (this.$style && !isEqual(value, this.$style.getPlacement())) {
+        this.$style.setFont(value)
+        this.scheduleRefresh()
+      }
+    },
     offsetX (value) {
       if (this.$style && !isEqual(value, this.$style.getOffsetX())) {
         this.$style.setOffsetX(value)
@@ -109,6 +114,12 @@
         this.scheduleRefresh()
       }
     },
+    rotateWithView (value) {
+      if (this.$style && !isEqual(value, this.$style.getRotateWithView())) {
+        this.$style.setRotation(value)
+        this.scheduleRefresh()
+      }
+    },
     scale (value) {
       if (this.$style && !isEqual(value, this.$style.getScale())) {
         this.$style.setScale(value)
@@ -145,7 +156,8 @@
       empty: false,
       attrs () {
         return {
-          class: this.$options.name,
+          id: this.vmId,
+          class: this.cmpName,
         }
       },
     },
diff --git a/src/component/tile-layer/layer.vue b/src/component/tile-layer/layer.vue
index c751afa8..0a97e9e3 100644
--- a/src/component/tile-layer/layer.vue
+++ b/src/component/tile-layer/layer.vue
@@ -1,6 +1,6 @@
 <script>
   import TileLayer from 'ol/layer/Tile'
-  import layer from '../../mixin/layer'
+  import { layer } from '../../mixin'
 
   /**
    * @vueProps
diff --git a/src/component/vector-layer/layer.vue b/src/component/vector-layer/layer.vue
index 25776fe3..78ae4278 100644
--- a/src/component/vector-layer/layer.vue
+++ b/src/component/vector-layer/layer.vue
@@ -1,6 +1,6 @@
 <script>
   import VectorLayer from 'ol/layer/Vector'
-  import vectorLayer from '../../mixin/vector-layer'
+  import { vectorLayer } from '../../mixin'
 
   const RENDER_MODES = ['vector', 'image']
 
diff --git a/src/component/vector-source/source.vue b/src/component/vector-source/source.vue
index ce80a6a2..c346e8b3 100644
--- a/src/component/vector-source/source.vue
+++ b/src/component/vector-source/source.vue
@@ -1,165 +1,173 @@
 <script>
   import VectorSource from 'ol/source/Vector'
-  import { fetch } from 'whatwg-fetch'
-  import vectorSource from '../../mixin/vector-source'
-  import { getFeatureId } from '../../ol-ext/feature'
-  import { createGeoJsonFmt } from '../../ol-ext/format'
-  import { loadingAll } from '../../ol-ext/load-strategy'
-  import { transform } from '../../ol-ext/proj'
-  import { constant, difference, isEmpty, isFinite, isFunction, stubArray } from '../../util/minilo'
+  import { vectorSource } from '../../mixin'
+  import { createGeoJsonFmt, getFeatureId, initializeFeature, loadingAll, transform } from '../../ol-ext'
+  import { constant, difference, isEqual, isFinite, isFunction, stubArray } from '../../util/minilo'
+  import { makeWatchers } from '../../util/vue-helpers'
 
-  const props = {
-    /**
-     * Array of GeoJSON features with coordinates in the map view projection.
-     * @type {Object[]} features
-     */
-    features: {
-      type: Array,
-      default: stubArray,
-    },
-    /**
-     * Source loader factory.
-     * Source loader should load features from some remote service, decode them and pas to `features` prop to render.
-     * @type {(function(): FeatureLoader|undefined)} loaderFactory
-     */
-    loaderFactory: {
-      type: Function,
-      default: defaultLoaderFactory,
-    },
-    /**
-     * Source format factory
-     * @type {(function(): Feature|undefined)} formatFactory
-     */
-    formatFactory: {
-      type: Function,
-      default: defaultFormatFactory,
-    },
-    /**
-     * String or url factory
-     * @type {(string|function(): string|FeatureUrlFunction|undefined)} url
-     */
-    url: [String, Function],
-    /**
-     * Loading strategy factory.
-     * Extent here in map view projection.
-     * @type {(function(): LoadingStrategy|undefined)} strategyFactory
-     */
-    strategyFactory: {
-      type: Function,
-      default: defaultStrategyFactory,
-    },
-    overlaps: {
-      type: Boolean,
-      default: true,
-    },
-  }
-
-  const computed = {
-    featureIds () {
-      return this.features.map(getFeatureId)
-    },
-  }
-
-  const methods = {
-    /**
-     * @return {VectorSource}
-     * @protected
-     */
-    createSource () {
-      return new VectorSource({
-        attributions: this.attributions,
-        projection: this.resolvedDataProjection,
-        loader: this.createLoader(),
-        useSpatialIndex: this.useSpatialIndex,
-        wrapX: this.wrapX,
-        logo: this.logo,
-        strategy: this.strategyFactory.call(undefined, this),
-        format: this.formatFactory.call(undefined, this),
-        url: this.createUrlFunc(),
-        overlaps: this.overlaps,
-      })
+  export default {
+    name: 'vl-source-vector',
+    mixins: [vectorSource],
+    props: {
+      /**
+       * Array of GeoJSON features with coordinates in the map view projection.
+       * @type {Object[]} features
+       */
+      features: {
+        type: Array,
+        default: stubArray,
+      },
+      /**
+       * Source loader factory.
+       * Source loader should load features from some remote service, decode them and pas to `features` prop to render.
+       * @type {(function(): FeatureLoader|undefined)} loaderFactory
+       */
+      loaderFactory: {
+        type: Function,
+      },
+      /**
+       * Source format factory
+       * @type {(function(): Feature|undefined)} formatFactory
+       */
+      formatFactory: {
+        type: Function,
+        default: defaultFormatFactory,
+      },
+      /**
+       * String or url factory
+       * @type {(string|function(): string|FeatureUrlFunction|undefined)} url
+       */
+      url: [String, Function],
+      /**
+       * Loading strategy factory.
+       * Extent here in map view projection.
+       * @type {(function(): LoadingStrategy|undefined)} strategyFactory
+       */
+      strategyFactory: {
+        type: Function,
+        default: defaultStrategyFactory,
+      },
+      overlaps: {
+        type: Boolean,
+        default: true,
+      },
     },
-    /**
-     * @protected
-     */
-    createUrlFunc () {
-      if (!this.url) {
-        return
-      }
+    computed: {
+      urlFunc () {
+        if (!this.url) return
 
-      let url = this.url
-      if (!isFunction(url)) {
-        url = constant(this.url)
-      }
-      // wrap strategy function to transform map view projection to source projection
-      return (extent, resolution, projection) => url(
-        transformExtent(extent, projection, this.resolvedDataProjection),
-        resolution,
-        this.resolvedDataProjection,
-      )
-    },
-    /**
-     * @protected
-     */
-    createLoader () {
-      if (!this.url) {
-        return
-      }
+        let url = this.url
+        if (!isFunction(url)) {
+          url = constant(this.url)
+        }
 
-      const loader = this.loaderFactory.call(undefined, this)
-      // wrap strategy function to transform map view projection to source projection
-      return async (extent, resolution, projection) => {
-        const features = await loader(
-          transformExtent(extent, projection, this.resolvedDataProjection),
-          resolution,
-          this.resolvedDataProjection,
-        )
+        return (extent, resolution, projection) => {
+          extent = transformExtent(extent, projection, this.resolvedDataProjection)
+          projection = this.resolvedDataProjection
 
-        if (Array.isArray(features)) {
-          this.$source.addFeatures(features)
+          return url(extent, resolution, projection)
         }
-      }
-    },
-    /**
-     * @return {void}
-     * @protected
-     */
-    mount () {
-      this::vectorSource.methods.mount()
-      this.addFeatures(this.features)
+      },
+      loaderFunc () {
+        if (!this.loaderFactory) return
+
+        const loader = this.loaderFactory()
+
+        return async (extent, resolution, projection) => {
+          let features = await loader(
+            transformExtent(extent, projection, this.resolvedDataProjection),
+            resolution,
+            this.resolvedDataProjection,
+          )
+          if (!Array.isArray(features)) {
+            features = this.readSourceData(features)
+          }
+          if (Array.isArray(features)) {
+            this.addFeatures(features)
+          }
+        }
+      },
+      loadingStrategy () {
+        return this.strategyFactory()
+      },
+      dataFormat () {
+        return this.formatFactory()
+      },
     },
-    /**
-     * @return {void}
-     * @protected
-     */
-    unmount () {
-      this.clear()
-      this::vectorSource.methods.unmount()
+    methods: {
+      /**
+       * @return {VectorSource}
+       * @protected
+       */
+      createSource () {
+        return new VectorSource({
+          attributions: this.attributions,
+          features: this.$featuresCollection,
+          projection: this.resolvedDataProjection,
+          loader: this.loaderFunc,
+          useSpatialIndex: this.useSpatialIndex,
+          wrapX: this.wrapX,
+          logo: this.logo,
+          strategy: this.loadingStrategy,
+          format: this.dataFormat,
+          url: this.urlFunc,
+          overlaps: this.overlaps,
+        })
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      mount () {
+        this::vectorSource.methods.mount()
+        this.addFeatures(this.features)
+      },
+      /**
+       * @return {void}
+       * @protected
+       */
+      unmount () {
+        this.clear()
+        this::vectorSource.methods.unmount()
+      },
+      /**
+       * @param {mixed} data
+       * @returns {Array<FeatureLike>|Array<Feature>}
+       */
+      readSourceData (data) {
+        return this.dataFormat.readFeatures(data, {
+          featureProjection: this.viewProjection,
+          dataProjection: this.resolvedDataProjection,
+        })
+      },
     },
-  }
-
-  const diffById = (a, b) => a.id === b.id
-  const watch = {
-    features (value, oldValue) {
-      if (!this.$source) return
-
-      let forAdd = difference(value, oldValue, diffById)
-      let forRemove = difference(oldValue, value, diffById)
-
-      this.addFeatures(forAdd)
-      this.removeFeatures(forRemove)
+    watch: {
+      features: {
+        deep: true,
+        handler (features) {
+          if (!this.$source || isEqual(features, this.featuresDataProj)) return
+
+          features = features.map(feature => initializeFeature({ ...feature }))
+          this.addFeatures(features)
+
+          const forRemove = difference(this.featuresDataProj, features, (a, b) => getFeatureId(a) === getFeatureId(b))
+          this.removeFeatures(forRemove)
+        },
+      },
+      ...makeWatchers([
+        'loadingStrategy',
+        'dataFormat',
+        'urlFunc',
+        'loaderFactory',
+        'formatFactory',
+        'strategyFactory',
+        'overlaps',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
     },
   }
 
-  export default {
-    name: 'vl-source-vector',
-    mixins: [vectorSource],
-    props,
-    computed,
-    methods,
-    watch,
-  }
-
   /**
    * @return {LoadingStrategy}
    */
@@ -174,40 +182,6 @@
     return createGeoJsonFmt()
   }
 
-  /**
-   * Default loader for provided URL.
-   *
-   * @param vm
-   * @return {Function}
-   */
-  function defaultLoaderFactory (vm) {
-    return (extent, resolution, projection) => {
-      let url = vm.$source.getUrl()
-      if (isFunction(url)) {
-        url = url(extent, resolution, projection)
-      }
-
-      if (isEmpty(url)) {
-        return []
-      }
-
-      return fetch(url, {
-        credentials: 'same-origin',
-        mode: 'cors',
-      }).then(response => response.text())
-        .then(text => {
-          if (!vm.$source) {
-            return []
-          }
-
-          return vm.$source.getFormat().readFeatures(text, {
-            featureProjection: vm.viewProjection,
-            dataProjection: vm.resolvedDataProjection,
-          })
-        })
-    }
-  }
-
   function transformExtent (extent, sourceProj, destProj) {
     extent = extent.slice()
     if (isFinite(extent[0]) && isFinite(extent[1])) {
diff --git a/src/component/vector-tile-layer/layer.vue b/src/component/vector-tile-layer/layer.vue
index 9c0521d0..35a95ebb 100644
--- a/src/component/vector-tile-layer/layer.vue
+++ b/src/component/vector-tile-layer/layer.vue
@@ -1,6 +1,6 @@
 <script>
   import VectorTileLayer from 'ol/layer/VectorTile'
-  import vectorLayer from '../../mixin/vector-layer'
+  import { vectorLayer } from '../../mixin'
 
   const RENDER_MODES = ['vector', 'image', 'hybrid']
 
diff --git a/src/component/vector-tile-source/source.vue b/src/component/vector-tile-source/source.vue
index ec41335a..93376855 100644
--- a/src/component/vector-tile-source/source.vue
+++ b/src/component/vector-tile-source/source.vue
@@ -1,53 +1,54 @@
 <script>
   import VectorTileSource from 'ol/source/VectorTile'
-  import tileSource from '../../mixin/tile-source'
-  import { createMvtFmt } from '../../ol-ext/format'
-
-  const props = {
-    cacheSize: {
-      type: Number,
-      default: 128,
-    },
-    /**
-     * Source format factory
-     * @type {(function(): Feature|undefined)} formatFactory
-     */
-    formatFactory: {
-      type: Function,
-      default: defaultFormatFactory,
-    },
-    overlaps: {
-      type: Boolean,
-      default: true,
-    },
-  }
-
-  const methods = {
-    /**
-     * @return {VectorTileSource}
-     */
-    createSource () {
-      return new VectorTileSource({
-        attributions: this.attributions,
-        cacheSize: this.cacheSize,
-        format: this.formatFactory(),
-        logo: this.logo,
-        overlaps: this.overlaps,
-        projection: this.projection,
-        tileGrid: this._tileGrid,
-        tileLoadFunction: this.tileLoadFunction,
-        tileUrlFunction: this.createUrlFunc(),
-        wrapX: this.wrapX,
-        transition: this.transition,
-      })
-    },
-  }
+  import { tileSource } from '../../mixin'
+  import { createMvtFmt } from '../../ol-ext'
 
   export default {
     name: 'vl-source-vector-tile',
     mixins: [tileSource],
-    props,
-    methods,
+    props: {
+      cacheSize: {
+        type: Number,
+        default: 128,
+      },
+      /**
+       * Source format factory
+       * @type {(function(): Feature|undefined)} formatFactory
+       */
+      formatFactory: {
+        type: Function,
+        default: defaultFormatFactory,
+      },
+      overlaps: {
+        type: Boolean,
+        default: true,
+      },
+    },
+    computed: {
+      dataFormat () {
+        return this.formatFactory()
+      },
+    },
+    methods: {
+      /**
+       * @return {VectorTileSource}
+       */
+      createSource () {
+        return new VectorTileSource({
+          attributions: this.attributions,
+          cacheSize: this.cacheSize,
+          format: this.dataFormat,
+          logo: this.logo,
+          overlaps: this.overlaps,
+          projection: this.projection,
+          tileGrid: this._tileGrid,
+          tileLoadFunction: this.tileLoadFunction,
+          tileUrlFunction: this.urlFunc,
+          wrapX: this.wrapX,
+          transition: this.transition,
+        })
+      },
+    },
   }
 
   /**
diff --git a/src/component/wms-source/source.vue b/src/component/wms-source/source.vue
index 2f90c6b8..fbb42489 100644
--- a/src/component/wms-source/source.vue
+++ b/src/component/wms-source/source.vue
@@ -1,55 +1,61 @@
 <script>
   import TileWMSSource from 'ol/source/TileWMS'
   import WMSServerType from 'ol/source/WMSServerType'
+  import { makeWatchers } from '../../util/vue-helpers'
   import { tileSource, wmsSource } from '../../mixin'
 
-  const props = {
-    gutter: Number,
-    hidpi: {
-      type: Boolean,
-      default: true,
-    },
-    serverType: {
-      type: String,
-      validator: value => !value | Object.values(WMSServerType).includes(value),
-    },
-    url: {
-      type: String,
-      required: true,
-      validator: value => !!value.length,
-    },
-  }
-
-  const methods = {
-    /**
-     * @returns {TileWMS}
-     * @protected
-     */
-    createSource () {
-      return new TileWMSSource({
-        attributions: this.attributions,
-        cacheSize: this.cacheSize,
-        params: this.allParams,
-        crossOrigin: this.crossOrigin,
-        gutter: this.gutter,
-        hidpi: this.hidpi,
-        logo: this.logo,
-        tileGrid: this._tileGrid,
-        projection: this.projection,
-        reprojectionErrorThreshold: this.reprojectionErrorThreshold,
-        serverType: this.serverType,
-        wrapX: this.wrapX,
-        url: this.urlTmpl,
-        transition: this.transition,
-        tileLoadFunction: this.tileLoadFunction,
-      })
-    },
-  }
-
   export default {
     name: 'vl-source-wms',
     mixins: [tileSource, wmsSource],
-    props,
-    methods,
+    props: {
+      gutter: Number,
+      hidpi: {
+        type: Boolean,
+        default: true,
+      },
+      serverType: {
+        type: String,
+        validator: value => !value || Object.values(WMSServerType).includes(value),
+      },
+      url: {
+        type: String,
+        required: true,
+        validator: value => !!value.length,
+      },
+    },
+    methods: {
+      /**
+       * @returns {TileWMS}
+       * @protected
+       */
+      createSource () {
+        return new TileWMSSource({
+          attributions: this.attributions,
+          cacheSize: this.cacheSize,
+          params: this.allParams,
+          crossOrigin: this.crossOrigin,
+          gutter: this.gutter,
+          hidpi: this.hidpi,
+          logo: this.logo,
+          tileGrid: this._tileGrid,
+          projection: this.projection,
+          reprojectionErrorThreshold: this.reprojectionErrorThreshold,
+          serverType: this.serverType,
+          wrapX: this.wrapX,
+          url: this.urlTmpl,
+          transition: this.transition,
+          tileLoadFunction: this.tileLoadFunction,
+        })
+      },
+    },
+    watch: {
+      ...makeWatchers([
+        'gutter',
+        'hidpi',
+        'serverType',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
+    },
   }
 </script>
diff --git a/src/component/wmts-source/source.vue b/src/component/wmts-source/source.vue
index bc8dacf0..c2d63f31 100644
--- a/src/component/wmts-source/source.vue
+++ b/src/component/wmts-source/source.vue
@@ -1,107 +1,128 @@
 <script>
   import WMTSSource from 'ol/source/WMTS'
   import WMTSTileGrid from 'ol/tilegrid/WMTS'
-  import tileSource from '../../mixin/tile-source'
-  import { EXTENT_CORNER, WMTS_FORMAT, WMTS_REQUEST_ENCODING, WMTS_VERSION } from '../../ol-ext/consts'
-  import { createExtentFromProjection, getExtentCorner } from '../../ol-ext/extent'
-  import { resolutionsFromExtent } from '../../ol-ext/tile-grid'
-  import { hasView } from '../../util/assert'
+  import { tileSource } from '../../mixin'
+  import {
+    createExtentFromProjection,
+    EXTENT_CORNER,
+    getExtentCorner,
+    resolutionsFromExtent,
+    WMTS_FORMAT,
+    WMTS_REQUEST_ENCODING,
+    WMTS_VERSION,
+  } from '../../ol-ext'
   import { range } from '../../util/minilo'
+  import { makeWatchers } from '../../util/vue-helpers'
 
-  const props = {
-    dimensions: Object,
-    format: {
-      type: String,
-      default: WMTS_FORMAT,
-    },
-    layerName: {
-      type: String,
-      required: true,
-    },
-    matrixSet: {
-      type: String,
-      required: true,
-    },
-    requestEncoding: {
-      type: String,
-      default: WMTS_REQUEST_ENCODING,
-    },
-    styleName: {
-      type: String,
-      required: true,
-    },
-    version: {
-      type: String,
-      default: WMTS_VERSION,
-    },
-    url: {
-      type: String,
-      required: true,
-    },
-    origin: {
-      type: Array,
-    },
-    resolutions: {
-      type: Array,
+  export default {
+    name: 'vl-source-wmts',
+    mixins: [tileSource],
+    props: {
+      dimensions: Object,
+      format: {
+        type: String,
+        default: WMTS_FORMAT,
+      },
+      layerName: {
+        type: String,
+        required: true,
+      },
+      matrixSet: {
+        type: String,
+        required: true,
+      },
+      requestEncoding: {
+        type: String,
+        default: WMTS_REQUEST_ENCODING,
+      },
+      styleName: {
+        type: String,
+        required: true,
+      },
+      version: {
+        type: String,
+        default: WMTS_VERSION,
+      },
+      url: {
+        type: String,
+        required: true,
+      },
+      origin: {
+        type: Array,
+      },
+      resolutions: {
+        type: Array,
+      },
     },
-  }
+    methods: {
+      /**
+       * @returns {WMTS}
+       * @protected
+       */
+      createSource () {
+        return new WMTSSource({
+          attributions: this.attributions,
+          cacheSize: this.cacheSize,
+          crossOrigin: this.crossOrigin,
+          dimensions: this.dimensions,
+          format: this.format,
+          layer: this.layerName,
+          logo: this.logo,
+          matrixSet: this.matrixSet,
+          origin: this.origin,
+          projection: this.projection,
+          reprojectionErrorThreshold: this.reprojectionErrorThreshold,
+          requestEncoding: this.requestEncoding,
+          resolutions: this.resolutions,
+          tileGrid: this._tileGrid,
+          tilePixelRatio: this.tilePixelRatio,
+          style: this.styleName,
+          version: this.version,
+          url: this.urlTmpl,
+          wrapX: this.wrapX,
+          transition: this.transition,
+          tileLoadFunction: this.tileLoadFunction,
+        })
+      },
+      /**
+       * @return {Promise}
+       * @protected
+       */
+      init () {
+        let extent = createExtentFromProjection(this.projection)
+        let resolutions = this.resolutions ? this.resolutions : resolutionsFromExtent(extent, this.maxZoom, this.tileSize)
+        let origin = this.origin ? this.origin : getExtentCorner(extent, EXTENT_CORNER.TOP_LEFT)
+        let matrixIds = Array.from(range(this.minZoom, resolutions.length))
+        /**
+         * @type {module:ol/Tile~UrlFunction}
+         * @protected
+         */
+        this._tileGrid = new WMTSTileGrid({
+          extent,
+          origin,
+          resolutions,
+          tileSize: this.tileSize,
+          minZoom: this.minZoom,
+          matrixIds,
+        })
 
-  const methods = {
-    /**
-     * @returns {WMTS}
-     * @protected
-     */
-    createSource () {
-      return new WMTSSource({
-        attributions: this.attributions,
-        cacheSize: this.cacheSize,
-        crossOrigin: this.crossOrigin,
-        dimensions: this.dimensions,
-        format: this.format,
-        layer: this.layerName,
-        logo: this.logo,
-        matrixSet: this.matrixSet,
-        origin: this.origin,
-        projection: this.projection,
-        reprojectionErrorThreshold: this.reprojectionErrorThreshold,
-        requestEncoding: this.requestEncoding,
-        resolutions: this.resolutions,
-        tileGrid: this._tileGrid,
-        tilePixelRatio: this.tilePixelRatio,
-        style: this.styleName,
-        version: this.version,
-        url: this.urlTmpl,
-        wrapX: this.wrapX,
-        transition: this.transition,
-        tileLoadFunction: this.tileLoadFunction,
-      })
+        return this::tileSource.methods.init()
+      },
     },
-    /**
-     * @return {WMTS}
-     * @protected
-     */
-    createTileGrid () {
-      hasView(this)
-
-      var extent = createExtentFromProjection(this.$view.getProjection())
-      var resolutions = this.resolutions ? this.resolutions : resolutionsFromExtent(extent, this.maxZoom, this.tileSize)
-      var origin = this.origin ? this.origin : getExtentCorner(extent, EXTENT_CORNER.TOP_LEFT)
-
-      return new WMTSTileGrid({
-        extent: extent,
-        origin: origin,
-        resolutions: resolutions,
-        tileSize: this.tileSize,
-        minZoom: this.minZoom,
-        matrixIds: Array.from(range(this.minZoom, resolutions.length)),
-      })
+    watch: {
+      ...makeWatchers([
+        'dimensions',
+        'format',
+        'layerName',
+        'matrixSet',
+        'requestEncoding',
+        'styleName',
+        'version',
+        'resolutions',
+        'origin',
+      ], () => function () {
+        this.scheduleRecreate()
+      }),
     },
   }
-
-  export default {
-    name: 'vl-source-wmts',
-    mixins: [tileSource],
-    props,
-    methods,
-  }
 </script>
diff --git a/src/component/xyz-source/source.vue b/src/component/xyz-source/source.vue
index 8d7924c7..10031ba5 100644
--- a/src/component/xyz-source/source.vue
+++ b/src/component/xyz-source/source.vue
@@ -1,11 +1,8 @@
 <script>
-  import xyzSource from '../../mixin/xyz-source'
-
-  const props = {}
+  import { xyzSource } from '../../mixin'
 
   export default {
     name: 'vl-source-xyz',
     mixins: [xyzSource],
-    props,
   }
 </script>
diff --git a/src/index.js b/src/index.js
index 92347907..47e696a7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,6 +9,7 @@ import * as FillStyle from './component/fill-style'
 import * as Geoloc from './component/geoloc'
 import * as Graticule from './component/graticule'
 import * as GroupLayer from './component/group-layer'
+import * as HeatmapLayer from './component/heatmap-layer'
 import * as IconStyle from './component/icon-style'
 import * as ImageLayer from './component/image-layer'
 import * as ImageStaticSource from './component/image-static-source'
@@ -41,7 +42,7 @@ import * as VectorTileSource from './component/vector-tile-source'
 import * as WmsSource from './component/wms-source'
 import * as WmtsSource from './component/wmts-source'
 import * as XyzSource from './component/xyz-source'
-import './sass/main.sass'
+import './styles/main.scss'
 
 /**
  * @const {string} VueLayers version.
@@ -71,6 +72,7 @@ function plugin (Vue, options = {}) {
   Vue.use(Geoloc, options)
   Vue.use(Graticule, options)
   Vue.use(GroupLayer, options)
+  Vue.use(HeatmapLayer, options)
   Vue.use(IconStyle, options)
   Vue.use(ImageLayer, options)
   Vue.use(ImageStaticSource, options)
@@ -122,6 +124,7 @@ export {
   Geoloc,
   Graticule,
   GroupLayer,
+  HeatmapLayer,
   IconStyle,
   ImageLayer,
   ImageStaticSource,
diff --git a/src/mixin/arcgis-source.js b/src/mixin/arcgis-source.js
index ece10f70..ff01d5a7 100644
--- a/src/mixin/arcgis-source.js
+++ b/src/mixin/arcgis-source.js
@@ -1,35 +1,6 @@
-import { reduce } from '../util/minilo'
-
-const cleanExtParams = params => reduce(params, (params, value, key) => {
-  let filterKeys = [
-    'FORMAT',
-    'F',
-    'LAYERS',
-    'LAYERDEFS',
-    'DYNAMICLAYERS',
-    'DPI',
-    'TRANSPARENT',
-    'TIME',
-    'LAYERTIMEOPTIONS',
-    'GDBVERSION',
-    'MAPSCALE',
-    'ROTATION',
-    'DATUMTRANSFORMATIONS',
-    'MAPRANGEVALUES',
-    'LAYERRANGEVALUES',
-    'LAYERPARAMETERVALUES',
-    'HISTORICMOMENT',
-  ]
-
-  key = key.toUpperCase()
-  if (filterKeys.includes(key)) {
-    return params
-  }
-
-  params[key] = value
-
-  return params
-}, {})
+import { cleanSourceExtraParams, ARCGIS_EXTRA_PARAMS } from '../ol-ext'
+import { isEqual, pick } from '../util/minilo'
+import { makeWatchers } from '../util/vue-helpers'
 
 const serialize = value => {
   if (value == null) return value
@@ -37,121 +8,112 @@ const serialize = value => {
   return typeof value === 'object' ? JSON.stringify(value) : value
 }
 
-const props = {
-  /**
-   * Extra WMS request parameters
-   */
-  extParams: Object,
-  format: {
-    type: String,
-    default: 'PNG32',
-  },
-  layers: String,
-  layerDefs: [Object, String],
-  dynamicLayers: [Object, String],
-  dpi: Number,
-  transparent: {
-    type: Boolean,
-    default: true,
-  },
-  time: String,
-  layerTimeOptions: [Object, String],
-  gdbVersion: String,
-  mapScale: String,
-  rotation: Number,
-  datumTransformations: [Array, String],
-  mapRangeValues: [Array, String],
-  layerRangeValues: [Array, String],
-  layerParameterValues: [Array, String],
-  historicMoment: Number,
-}
+export default {
+  props: {
+    /**
+     * Extra ArcGIS request parameters
+     * todo rename to extraParams
+     */
+    extParams: Object,
+    format: {
+      type: String,
+      default: 'PNG32',
+    },
+    layers: String,
+    layerDefs: [Object, String],
+    dynamicLayers: [Object, String],
+    dpi: Number,
+    transparent: {
+      type: Boolean,
+      default: true,
+    },
+    time: String,
+    layerTimeOptions: [Object, String],
+    gdbVersion: String,
+    mapScale: String,
+    rotation: Number,
+    datumTransformations: [Array, String],
+    mapRangeValues: [Array, String],
+    layerRangeValues: [Array, String],
+    layerParameterValues: [Array, String],
+    historicMoment: Number,
+  },
+  computed: {
+    // todo rename to cleanExtraParams
+    cleanExtParams () {
+      return this.extParams
+        ? cleanSourceExtraParams(this.extParams, ARCGIS_EXTRA_PARAMS)
+        : undefined
+    },
+    allParams () {
+      return {
+        ...this.cleanExtParams,
+        LAYERS: this.layers,
+        FORMAT: this.format,
+        LAYERDEFS: serialize(this.layerDefs),
+        DYNAMICLAYERS: serialize(this.dynamicLayers),
+        DPI: this.dpi,
+        TRANSPARENT: this.transparent,
+        TIME: serialize(this.time),
+        LAYERTIMEOPTIONS: serialize(this.layerTimeOptions),
+        GDBVERSION: this.gdbVersion,
+        MAPSCALE: this.mapScale,
+        ROTATION: this.rotation,
+        DATUMTRANSFORMATIONS: serialize(this.datumTransformations),
+        MAPRANGEVALUES: serialize(this.mapRangeValues),
+        LAYERRANGEVALUES: serialize(this.layerRangeValues),
+        LAYERPARAMETERVALUES: serialize(this.layerParameterValues),
+        HISTORICMOMENT: serialize(this.historicMoment),
+      }
+    },
+  },
+  watch: {
+    ...makeWatchers([
+      'layers',
+      'format',
+      'dpi',
+      'transparent',
+      'gdbVersion',
+      'mapScale',
+      'rotation',
+      'historicMoment',
+    ], prop => function (value) {
+      if (!this.$source) return
 
-const computed = {
-  cleanExtParams () {
-    return this.extParams ? cleanExtParams(this.extParams) : undefined
-  },
-  allParams () {
-    return {
-      ...this.cleanExtParams,
-      LAYERS: this.layers,
-      FORMAT: this.format,
-      LAYERDEFS: serialize(this.layerDefs),
-      DYNAMICLAYERS: serialize(this.dynamicLayers),
-      DPI: this.dpi,
-      TRANSPARENT: this.transparent,
-      TIME: serialize(this.time),
-      LAYERTIMEOPTIONS: serialize(this.layerTimeOptions),
-      GDBVERSION: this.gdbVersion,
-      MAPSCALE: this.mapScale,
-      ROTATION: this.rotation,
-      DATUMTRANSFORMATIONS: serialize(this.datumTransformations),
-      MAPRANGEVALUES: serialize(this.mapRangeValues),
-      LAYERRANGEVALUES: serialize(this.layerRangeValues),
-      LAYERPARAMETERVALUES: serialize(this.layerParameterValues),
-      HISTORICMOMENT: serialize(this.historicMoment),
-    }
-  },
-}
+      prop = prop.toUpperCase()
+      const params = this.$source.getParams() || {}
 
-const methods = {}
+      if (isEqual(value, params[value])) return
 
-const watch = {
-  layers (LAYERS) {
-    this.$source && this.$source.updateParams({ LAYERS })
-  },
-  format (FORMAT) {
-    this.$source && this.$source.updateParams({ FORMAT })
-  },
-  layerDefs (LAYERDEFS) {
-    this.$source && this.$source.updateParams({ LAYERDEFS: serialize(LAYERDEFS) })
-  },
-  dynamicLayers (DYNAMICLAYERS) {
-    this.$source && this.$source.updateParams({ DYNAMICLAYERS: serialize(DYNAMICLAYERS) })
-  },
-  dpi (DPI) {
-    this.$source && this.$source.updateParams({ DPI })
-  },
-  transparent (TRANSPARENT) {
-    this.$source && this.$source.updateParams({ TRANSPARENT })
-  },
-  time (TIME) {
-    this.$source && this.$source.updateParams({ TIME: serialize(TIME) })
-  },
-  layerTimeOptions (LAYERTIMEOPTIONS) {
-    this.$source && this.$source.updateParams({ LAYERTIMEOPTIONS: serialize(LAYERTIMEOPTIONS) })
-  },
-  gdbVersion (GDBVERSION) {
-    this.$source && this.$source.updateParams({ GDBVERSION })
-  },
-  mapScale (MAPSCALE) {
-    this.$source && this.$source.updateParams({ MAPSCALE })
-  },
-  rotation (ROTATION) {
-    this.$source && this.$source.updateParams({ ROTATION })
-  },
-  datumTransformations (DATUMTRANSFORMATIONS) {
-    this.$source && this.$source.updateParams({ DATUMTRANSFORMATIONS: serialize(DATUMTRANSFORMATIONS) })
-  },
-  mapRangeValues (MAPRANGEVALUES) {
-    this.$source && this.$source.updateParams({ MAPRANGEVALUES: serialize(MAPRANGEVALUES) })
-  },
-  layerRangeValues (LAYERRANGEVALUES) {
-    this.$source && this.$source.updateParams({ LAYERRANGEVALUES: serialize(LAYERRANGEVALUES) })
-  },
-  layerParameterValues (LAYERPARAMETERVALUES) {
-    this.$source && this.$source.updateParams({ LAYERPARAMETERVALUES: serialize(LAYERPARAMETERVALUES) })
-  },
-  historicMoment (HISTORICMOMENT) {
-    this.$source && this.$source.updateParams({ HISTORICMOMENT })
-  },
-  extParams (value) {
-    this.$source && this.$source.updateParams(value ? cleanExtParams(value) : undefined)
-  },
-}
+      this.$source.updateParams({ [prop]: value })
+    }),
+    ...makeWatchers([
+      'layerDefs',
+      'dynamicLayers',
+      'time',
+      'layerTimeOptions',
+      'datumTransformations',
+      'mapRangeValues',
+      'layerRangeValues',
+      'layerParameterValues',
+    ], prop => function (value) {
+      if (!this.$source) return
 
-export default {
-  props,
-  computed,
-  methods,
-  watch,
+      prop = prop.toUpperCase()
+      value = serialize(value)
+      const params = this.$source.getParams() || {}
+
+      if (isEqual(value, params[value])) return
+
+      this.$source.updateParams({ [prop]: value })
+    }),
+    extParams (value) {
+      if (!this.$source) return
+
+      const params = pick(this.$source.getParams() || {}, Object.keys(value))
+      if (isEqual(value, params)) return
+
+      this.$source.updateParams(value ? cleanSourceExtraParams(value) : undefined)
+    },
+  },
 }
diff --git a/src/mixin/features-container.js b/src/mixin/features-container.js
index b7926484..66a3f073 100644
--- a/src/mixin/features-container.js
+++ b/src/mixin/features-container.js
@@ -1,108 +1,175 @@
+import Collection from 'ol/Collection'
 import Feature from 'ol/Feature'
 import Vue from 'vue'
-import { initFeature } from '../ol-ext/feature'
+import { merge as mergeObs } from 'rxjs/observable'
+import { debounceTime } from 'rxjs/operators'
+import { getFeatureId, getObjectUid, initializeFeature, mergeFeatures } from '../ol-ext'
 import { instanceOf } from '../util/assert'
-import { isPlainObject } from '../util/minilo'
+import { forEach, isPlainObject } from '../util/minilo'
 import projTransforms from './proj-transforms'
+import rxSubs from './rx-subs'
+import { observableFromOlEvent } from '../rx-ext'
 
-const methods = {
-  /**
-   * @return {IndexedCollectionAdapter|SourceCollectionAdapter}
-   * @protected
-   */
-  getFeaturesTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @param {Array<(Feature|Vue|Object)>} features
-   * @return {void}
-   */
-  addFeatures (features) {
-    features.forEach(::this.addFeature)
-  },
-  /**
-   * @param {Feature|Vue|Object} feature
-   * @return {void}
-   */
-  addFeature (feature) {
-    if (feature instanceof Vue) {
-      feature = feature.$feature
-    } else if (isPlainObject(feature)) {
-      feature = this.readFeatureInDataProj(feature)
-    }
-    instanceOf(feature, Feature)
+export default {
+  mixins: [rxSubs, projTransforms],
+  computed: {
+    featureIds () {
+      if (!this.rev) return []
 
-    this.prepareFeature(feature)
+      return this.getFeatures().map(getFeatureId)
+    },
+    featuresViewProj () {
+      if (!this.rev) return []
 
-    if (!this.getFeaturesTarget().has(feature)) {
-      this.getFeaturesTarget().add(feature)
-    }
-  },
-  /**
-   * @param {Array<(Feature|Vue|Object)>} features
-   * @return {void}
-   */
-  removeFeatures (features) {
-    features.forEach(::this.removeFeature)
-  },
-  /**
-   * @param {Feature|Vue|Object} feature
-   * @return {void}
-   */
-  removeFeature (feature) {
-    if (feature instanceof Vue) {
-      feature = feature.$feature
-    } else if (isPlainObject(feature)) {
-      // feature = this._features[feature.id]
-      feature = this.getFeatureById(feature.id)
-    }
-    if (!feature) return
+      return this.getFeatures().map(::this.writeFeatureInViewProj)
+    },
+    featuresDataProj () {
+      if (!this.rev) return []
 
-    if (this.getFeaturesTarget().has(feature)) {
-      this.getFeaturesTarget().remove(feature)
-    }
-  },
-  /**
-   * @return {void}
-   */
-  clearFeatures () {
-    this.getFeaturesTarget().clear()
-  },
-  /**
-   * @param {string|number} id
-   * @return {Feature|undefined}
-   */
-  getFeatureById (id) {
-    return this.getFeaturesTarget().findByKey(id)
+      return this.getFeatures().map(::this.writeFeatureInDataProj)
+    },
   },
-  /**
-   * @return {Feature[]}
-   */
-  getFeatures () {
-    return this.getFeaturesTarget().elements
-  },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
-
-    return {
-      get featuresContainer () { return vm },
-    }
+  methods: {
+    /**
+     * @param {Array<(Feature|Vue|Object)>} features
+     * @return {void}
+     */
+    addFeatures (features) {
+      forEach(features, ::this.addFeature)
+    },
+    /**
+     * @param {Feature|Vue|Object} feature
+     * @return {void}
+     */
+    addFeature (feature) {
+      if (feature instanceof Vue) {
+        feature = feature.$feature
+      } else if (isPlainObject(feature)) {
+        feature = this.readFeatureInDataProj(feature)
+      }
+      instanceOf(feature, Feature)
+      initializeFeature(feature)
+
+      const foundFeature = this.getFeatureById(getFeatureId(feature))
+      if (foundFeature == null) {
+        this.$featuresCollection.push(feature)
+      } else {
+        mergeFeatures(foundFeature, feature)
+      }
+    },
+    /**
+     * @param {Array<(Feature|Vue|Object)>} features
+     * @return {void}
+     */
+    removeFeatures (features) {
+      forEach(features, ::this.removeFeature)
+    },
+    /**
+     * @param {Feature|Vue|Object} feature
+     * @return {void}
+     */
+    removeFeature (feature) {
+      feature = this.getFeatureById(getFeatureId(feature))
+      if (!feature) return
+
+      initializeFeature(feature)
+      this.$featuresCollection.remove(feature)
+    },
+    /**
+     * @return {void}
+     */
+    clearFeatures () {
+      this.$featuresCollection.clear()
+    },
+    /**
+     * @param {string|number} featureId
+     * @return {Feature|undefined}
+     */
+    getFeatureById (featureId) {
+      // todo add hash {featureId => featureIdx, ....}
+      return this.$featuresCollection.getArray().find(feature => {
+        return getFeatureId(feature) === featureId
+      })
+    },
+    /**
+     * @return {Feature[]}
+     */
+    getFeatures () {
+      return this.$featuresCollection.getArray()
+    },
+    /**
+     * @return {Collection<Feature>>}
+     */
+    getFeaturesCollection () {
+      return this._featuresCollection
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return {
+        get featuresContainer () { return vm },
+      }
+    },
   },
-  /**
-   * @param {Feature} feature
-   * @return {Feature}
-   * @protected
-   */
-  prepareFeature (feature) {
-    return initFeature(feature)
+  created () {
+    /**
+     * @type {Collection<Feature>>}
+     * @private
+     */
+    this._featuresCollection = new Collection()
+    this._featureSubs = {}
+
+    this::defineServices()
+    this::subscribeToCollectionEvents()
   },
 }
 
-export default {
-  mixins: [projTransforms],
-  methods,
+function defineServices () {
+  Object.defineProperties(this, {
+    $featuresCollection: {
+      enumerable: true,
+      get: this.getFeaturesCollection,
+    },
+  })
+}
+
+function subscribeToCollectionEvents () {
+  const adds = observableFromOlEvent(this.$featuresCollection, 'add')
+  this.subscribeTo(adds, ({ element }) => {
+    const elementUid = getObjectUid(element)
+    const propChanges = observableFromOlEvent(element, 'propertychange')
+    const otherChanges = observableFromOlEvent(element, 'change')
+    const featureChanges = mergeObs(propChanges, otherChanges).pipe(
+      debounceTime(1000 / 60)
+    )
+
+    this._featureSubs[elementUid] = this.subscribeTo(featureChanges, () => {
+      ++this.rev
+    })
+
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit('add:feature', element)
+    })
+  })
+
+  const removes = observableFromOlEvent(this.$featuresCollection, 'remove')
+  this.subscribeTo(removes, ({ element }) => {
+    const elementUid = getObjectUid(element)
+    if (this._featureSubs[elementUid]) {
+      this.unsubscribe(this._featureSubs[elementUid])
+      delete this._featureSubs[elementUid]
+    }
+
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit('remove:feature', element)
+    })
+  })
 }
diff --git a/src/mixin/geometry-container.js b/src/mixin/geometry-container.js
index 410f1f7a..36c7c193 100644
--- a/src/mixin/geometry-container.js
+++ b/src/mixin/geometry-container.js
@@ -2,72 +2,60 @@ import Vue from 'vue'
 import { isPlainObject } from '../util/minilo'
 import projTransforms from './proj-transforms'
 
-const methods = {
-  /**
-   * @return {{
-   *     getGeometry: function(): Geometry|undefined,
-   *     setGeometry: function(Geometry|undefined)
-   *   }|undefined}
-   * @protected
-   */
-  getGeometryTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Geometry|undefined}
-   */
-  getGeometry () {
-    return this._geometry
-  },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
-
-    return {
-      get geometryContainer () { return vm },
-    }
-  },
-  /**
-   * @param {Geometry|Vue|Object|undefined} geom
-   * @return {void}
-   * @throws {AssertionError}
-   */
-  setGeometry (geom) {
-    if (geom instanceof Vue) {
-      geom = geom.$geometry
-    } else if (isPlainObject(geom)) {
-      geom = this.readGeometryInDataProj(geom)
-    }
-
-    if (geom !== this._geometry) {
-      this._geometry = geom
-    }
-
-    const geomTarget = this.getGeometryTarget()
-    if (geomTarget && geom !== geomTarget.getGeometry()) {
-      geomTarget.setGeometry(geom)
-    }
-  },
-}
-
 export default {
   mixins: [projTransforms],
-  methods,
-  created () {
+  methods: {
     /**
-     * @type {Geometry|undefined}
-     * @private
+     * @return {{
+     *     getGeometry: function(): module:ol/geom/Geometry~Geometry|undefined,
+     *     setGeometry: function(module:ol/geom/Geometry~Geometry|undefined)
+     *   }|undefined}
+     * @protected
      */
-    this._geometry = undefined
+    getGeometryTarget () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {module:ol/geom/Geometry~Geometry|undefined}
+     */
+    getGeometry () {
+      return this._geometry
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return {
+        get geometryContainer () { return vm },
+      }
+    },
+    /**
+     * @param {module:ol/geom/Geometry~Geometry|Vue|Object|undefined} geom
+     * @return {void}
+     * @throws {AssertionError}
+     */
+    setGeometry (geom) {
+      if (geom instanceof Vue) {
+        geom = geom.$geometry
+      } else if (isPlainObject(geom)) {
+        geom = this.readGeometryInDataProj(geom)
+      }
+
+      if (geom !== this._geometry) {
+        /**
+         * @type {module:ol/geom/Geometry~Geometry|undefined}
+         * @private
+         */
+        this._geometry = geom
+      }
 
-    Object.defineProperties(this, {
-      $geometry: {
-        enumerable: true,
-        get: this.getGeometry,
-      },
-    })
+      const geomTarget = this.getGeometryTarget()
+      if (geomTarget && geom !== geomTarget.getGeometry()) {
+        geomTarget.setGeometry(geom)
+      }
+    },
   },
 }
diff --git a/src/mixin/geometry.js b/src/mixin/geometry.js
index af1edf56..b594a10c 100644
--- a/src/mixin/geometry.js
+++ b/src/mixin/geometry.js
@@ -1,8 +1,13 @@
 import { distinctUntilChanged, map as mapObs, throttleTime } from 'rxjs/operators'
-import { boundingExtent } from '../ol-ext/extent'
-import { findPointOnSurface } from '../ol-ext/geom'
-import { transforms } from '../ol-ext/proj'
-import observableFromOlEvent from '../rx-ext/from-ol-event'
+import {
+  boundingExtent,
+  findPointOnSurface,
+  getGeometryId,
+  initializeGeometry,
+  setGeometryId,
+  transforms,
+} from '../ol-ext'
+import { observableFromOlEvent } from '../rx-ext'
 import { hasGeometry } from '../util/assert'
 import { isEqual } from '../util/minilo'
 import mergeDescriptors from '../util/multi-merge-descriptors'
@@ -10,240 +15,258 @@ import cmp from './ol-virt-cmp'
 import projTransforms from './proj-transforms'
 import useMapCmp from './use-map-cmp'
 
-const props = {
-  /**
-   * Coordinates in the map view projection.
-   * @type {number[]|Coordinate}
-   */
-  coordinates: {
-    type: Array,
-    required: true,
-    validator: val => val.length,
-  },
-}
-
-const computed = {
-  /**
-   * @type {string}
-   * @abstract
-   * @readonly
-   */
-  type () {
-    throw new Error('Not implemented computed property')
-  },
-  /**
-   * @type {number[]|Extent|undefined}
-   */
-  extent () {
-    if (this.extentViewProj && this.resolvedDataProjection) {
-      return this.extentToDataProj(this.extentViewProj)
-    }
-  },
-  /**
-   * @type {number[]|Extent|undefined}
-   */
-  extentViewProj () {
-    if (this.rev && this.$geometry) {
-      return this.$geometry.getExtent()
-    }
-  },
-  /**
-   * @type {number[]|Coordinate|undefined}
-   */
-  point () {
-    if (this.pointViewProj && this.resolvedDataProjection) {
-      return this.pointToDataProj(this.pointViewProj)
-    }
-  },
-  /**
-   * @type {Array<number>}
-   */
-  pointViewProj () {
-    if (this.rev && this.$geometry) {
-      return findPointOnSurface(this.$geometry)
-    }
+export default {
+  mixins: [cmp, useMapCmp, projTransforms],
+  props: {
+    /**
+     * Coordinates in the map view projection.
+     * @type {number[]}
+     */
+    coordinates: {
+      type: Array,
+      required: true,
+      validator: val => val.length,
+    },
   },
-  /**
-   * @type {Array|undefined}
-   */
-  coordinatesViewProj () {
-    if (this.rev && this.$geometry) {
-      return this.$geometry.getCoordinates()
-    }
+  computed: {
+    /**
+     * @type {string}
+     * @abstract
+     * @readonly
+     */
+    type () {
+      throw new Error('Not implemented computed property')
+    },
+    /**
+     * @type {number[]|undefined}
+     */
+    extent () {
+      if (this.extentViewProj && this.resolvedDataProjection) {
+        return this.extentToDataProj(this.extentViewProj)
+      }
+    },
+    /**
+     * @type {number[]|undefined}
+     */
+    extentViewProj () {
+      if (this.rev && this.$geometry) {
+        return this.$geometry.getExtent()
+      }
+    },
+    /**
+     * @type {number[]|undefined}
+     */
+    point () {
+      if (this.pointViewProj && this.resolvedDataProjection) {
+        return this.pointToDataProj(this.pointViewProj)
+      }
+    },
+    /**
+     * @type {number[]}
+     */
+    pointViewProj () {
+      if (this.rev && this.$geometry) {
+        return findPointOnSurface(this.$geometry)
+      }
+    },
+    /**
+     * @type {number[]|undefined}
+     */
+    coordinatesViewProj () {
+      if (this.rev && this.$geometry) {
+        return this.$geometry.getCoordinates()
+      }
+    },
   },
-}
+  methods: {
+    /**
+     * @return {module:ol/geom/Geometry~Geometry|Promise<module:ol/geom/Geometry~Geometry>}
+     * @protected
+     */
+    async createOlObject () {
+      const geometry = await this.createGeometry()
 
-const methods = {
-  /**
-   * @return {Geometry|Promise<Geometry>}
-   * @protected
-   */
-  createOlObject () {
-    return this.createGeometry()
-  },
-  /**
-   * @return {Geometry|Promise<Geometry>}
-   * @protected
-   * @abstract
-   */
-  createGeometry () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Coordinate}
-   */
-  getCoordinates () {
-    hasGeometry(this)
-    return this.toDataProj(this.$geometry.getCoordinates())
-  },
-  /**
-   * @param {Coordinate} coordinates
-   */
-  setCoordinates (coordinates) {
-    hasGeometry(this)
-    this.$geometry.setCoordinates(this.toViewProj(coordinates))
-  },
-  /**
-   * @return {Promise}
-   * @throws {AssertionError}
-   * @protected
-   */
-  init () {
-    this.setupTransformFunctions()
+      initializeGeometry(geometry, this.id)
 
-    return this::cmp.methods.init()
-  },
-  /**
-   * @protected
-   */
-  setupTransformFunctions () {
-    // define helper methods based on geometry type
-    const { transform } = transforms[this.type]
+      return geometry
+    },
     /**
-     * @method
-     * @param {Array} coordinates
-     * @return {number[]}
+     * @return {module:ol/geom/Geometry~Geometry|Promise<module:ol/geom/Geometry~Geometry>}
      * @protected
+     * @abstract
      */
-    this.toDataProj = coordinates => transform(coordinates, this.viewProjection, this.resolvedDataProjection)
+    createGeometry () {
+      throw new Error('Not implemented method')
+    },
     /**
-     * @method
-     * @param {Array} coordinates
      * @return {number[]}
+     */
+    getCoordinates () {
+      hasGeometry(this)
+
+      return this.toDataProj(this.$geometry.getCoordinates())
+    },
+    /**
+     * @param {number[]} coordinates
+     */
+    setCoordinates (coordinates) {
+      hasGeometry(this)
+
+      this.$geometry.setCoordinates(this.toViewProj(coordinates))
+    },
+    /**
+     * @return {Promise}
+     * @throws {AssertionError}
      * @protected
      */
-    this.toViewProj = coordinates => transform(coordinates, this.resolvedDataProjection, this.viewProjection)
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::cmp.methods.deinit()
-  },
-  /**
-   * @return {Promise}
-   */
-  refresh () {
-    return this::cmp.methods.refresh()
-  },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+    init () {
+      this.setupTransformFunctions()
 
-    return mergeDescriptors(this::cmp.methods.getServices(), {
-      get geometry () { return vm.$geometry },
-    })
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this.$geometryContainer && this.$geometryContainer.setGeometry(this)
-    this.subscribeAll()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.unsubscribeAll()
-    this.$geometryContainer && this.$geometryContainer.setGeometry(undefined)
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  subscribeAll () {
-    this::subscribeToGeomChanges()
+      return this::cmp.methods.init()
+    },
+    /**
+     * @protected
+     */
+    setupTransformFunctions () {
+      // define helper methods based on geometry type
+      const { transform } = transforms[this.type]
+      /**
+       * @method
+       * @param {number[]} coordinates
+       * @return {number[]}
+       * @protected
+       */
+      this.toDataProj = coordinates => transform(coordinates, this.viewProjection, this.resolvedDataProjection)
+      /**
+       * @method
+       * @param {number[]} coordinates
+       * @return {number[]}
+       * @protected
+       */
+      this.toViewProj = coordinates => transform(coordinates, this.resolvedDataProjection, this.viewProjection)
+    },
+    /**
+     * @return {void|Promise}
+     * @protected
+     */
+    deinit () {
+      return this::cmp.methods.deinit()
+    },
+    /**
+     * @return {Promise}
+     */
+    refresh () {
+      return this::cmp.methods.refresh()
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return mergeDescriptors(this::cmp.methods.getServices(), {
+        get geometry () { return vm.$geometry },
+      })
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      this.$geometryContainer && this.$geometryContainer.setGeometry(this)
+      this.subscribeAll()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this.unsubscribeAll()
+      this.$geometryContainer && this.$geometryContainer.setGeometry(undefined)
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    subscribeAll () {
+      this::subscribeToGeomChanges()
+    },
   },
-}
+  watch: {
+    id (value) {
+      if (!this.$geometry || value === getGeometryId(this.$geometry)) {
+        return
+      }
 
-const watch = {
-  coordinates (value) {
-    if (!this.$geometry || !this.$view) return
+      setGeometryId(this.$geometry, value)
+    },
+    coordinates (value) {
+      if (!this.$geometry || !this.$view) return
 
-    // compares in data projection
-    let isEq = isEqualGeom({
-      coordinates: value,
-      extent: boundingExtent(value),
-    }, {
-      coordinates: this.getCoordinates(),
-      extent: this.extent,
-    })
+      // compares in data projection
+      let isEq = isEqualGeom({
+        coordinates: value,
+        extent: boundingExtent(value),
+      }, {
+        coordinates: this.getCoordinates(),
+        extent: this.extent,
+      })
+
+      if (isEq) return
 
-    if (!isEq) {
       this.setCoordinates(value)
-    }
-  },
-  resolvedDataProjection () {
-    if (this.$geometry) {
+    },
+    resolvedDataProjection () {
+      if (!this.$geometry) return
+
       this.setupTransformFunctions()
       this.setCoordinates(this.coordinates)
-    }
+    },
   },
-}
-
-export default {
-  mixins: [cmp, useMapCmp, projTransforms],
-  props,
-  computed,
-  watch,
-  methods,
   stubVNode: {
     empty () {
-      return this.$options.name
+      return this.vmId()
     },
   },
   created () {
-    Object.defineProperties(this, {
-      /**
-       * @type {Geometry|undefined}
-       */
-      $geometry: {
-        enumerable: true,
-        get: () => this.$olObject,
-      },
-      $map: {
-        enumerable: true,
-        get: () => this.$services && this.$services.map,
-      },
-      $view: {
-        enumerable: true,
-        get: () => this.$services && this.$services.view,
-      },
-      $geometryContainer: {
-        enumerable: true,
-        get: () => this.$services && this.$services.geometryContainer,
-      },
-    })
+    this::defineServices()
   },
 }
 
+function defineServices () {
+  Object.defineProperties(this, {
+    /**
+     * @type {module:ol/geom/Geometry~Geometry|undefined}
+     */
+    $geometry: {
+      enumerable: true,
+      get: () => this.$olObject,
+    },
+    /**
+     * @type {module:ol/PluggableMap~PluggableMap|undefined}
+     */
+    $map: {
+      enumerable: true,
+      get: () => this.$services && this.$services.map,
+    },
+    /**
+     * @type {module:ol/View~View|undefined}
+     */
+    $view: {
+      enumerable: true,
+      get: () => this.$services && this.$services.view,
+    },
+    /**
+     * @type {Object|undefined}
+     */
+    $geometryContainer: {
+      enumerable: true,
+      get: () => this.$services && this.$services.geometryContainer,
+    },
+  })
+}
+
 /**
  * @return {void}
  * @private
@@ -251,7 +274,7 @@ export default {
 function subscribeToGeomChanges () {
   hasGeometry(this)
 
-  const ft = 100
+  const ft = 1000 / 60
   const changes = observableFromOlEvent(
     this.$geometry,
     'change',
@@ -270,7 +293,10 @@ function subscribeToGeomChanges () {
 
   this.subscribeTo(changes, ({ prop, value }) => {
     ++this.rev
-    this.$emit(`update:${prop}`, value)
+
+    this.$nextTick(() => {
+      this.$emit(`update:${prop}`, value)
+    })
   })
 }
 
diff --git a/src/mixin/ident-map.js b/src/mixin/ident-map.js
index 3578362a..91cfcb89 100644
--- a/src/mixin/ident-map.js
+++ b/src/mixin/ident-map.js
@@ -5,11 +5,7 @@ import { identity } from '../util/minilo'
 // todo uncomment when IE 11 will die
 // const IDENTITY_MAP_PROP = Symbol('identityMap')
 const IDENTITY_MAP_PROP = 'identityMap'
-/**
- * @alias module:mixin/ident-map
- * @title identMap
- * @vueProto
- */
+
 export default {
   IDENTITY_MAP_PROP,
   props: {
@@ -42,6 +38,16 @@ export default {
   created () {
     this::initIdentityMap()
   },
+  watch: {
+    ident (value, prev) {
+      if (prev && this.$identityMap.has(prev)) {
+        this.$identityMap.unset(prev)
+      }
+      if (value && !this.$identityMap.has(value)) {
+        this.$identityMap.set(value)
+      }
+    },
+  },
 }
 
 /**
diff --git a/src/mixin/image-source.js b/src/mixin/image-source.js
index 3b1c49b5..5481de24 100644
--- a/src/mixin/image-source.js
+++ b/src/mixin/image-source.js
@@ -1,66 +1,61 @@
+import { EPSG_3857 } from '../ol-ext'
 import { observableFromOlEvent } from '../rx-ext'
-import { EPSG_3857 } from '../ol-ext/consts'
 import { hasSource } from '../util/assert'
+import { makeWatchers } from '../util/vue-helpers'
 import source from './source'
 
-/**
- * @vueProps
- */
-const props = {
-  crossOrigin: String,
-  projection: {
-    type: String,
-    default: EPSG_3857,
-  },
-}
-
-/**
- * @vueMethods
- */
-const methods = {
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
-    return this::source.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::source.methods.deinit()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this::source.methods.mount()
+export default {
+  mixins: [source],
+  props: {
+    crossOrigin: String,
+    projection: {
+      type: String,
+      default: EPSG_3857,
+    },
   },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this::source.methods.unmount()
+  methods: {
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    init () {
+      return this::source.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::source.methods.deinit()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      this::source.methods.mount()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this::source.methods.unmount()
+    },
+    subscribeAll () {
+      this::source.methods.subscribeAll()
+      this::subscribeToSourceEvents()
+    },
   },
-  subscribeAll () {
-    this::subscribeToSourceEvents()
+  watch: {
+    ...makeWatchers([
+      'crossOrigin',
+    ], () => function () {
+      this.scheduleRecreate()
+    }),
   },
 }
 
-/**
- * @vueProto
- * @alias module:mixin/image-source
- */
-export default {
-  mixins: [source],
-  props,
-  methods,
-}
-
 function subscribeToSourceEvents () {
   hasSource(this)
 
@@ -70,5 +65,11 @@ function subscribeToSourceEvents () {
     'imageloadstart',
   ])
 
-  this.subscribeTo(events, evt => this.$emit(evt.type, evt))
+  this.subscribeTo(events, evt => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(evt.type, evt)
+    })
+  })
 }
diff --git a/src/mixin/image-style.js b/src/mixin/image-style.js
index bec8f338..77314d39 100644
--- a/src/mixin/image-style.js
+++ b/src/mixin/image-style.js
@@ -1,66 +1,57 @@
 import style from './style'
 
-const props = {
-}
-
-const methods = {
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
-    return this::style.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::style.methods.deinit()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this.$stylesContainer && this.$stylesContainer.setImage(this)
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.$stylesContainer && this.$stylesContainer.setImage(undefined)
-  },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    return this::style.methods.getServices()
-  },
-  /**
-   * @return {Promise}
-   */
-  refresh () {
-    // recreate style
-    return this.recreate()
-  },
-}
-
-const watch = {
-}
-
 export default {
   mixins: [style],
-  props,
-  methods,
-  watch,
+  methods: {
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    init () {
+      return this::style.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::style.methods.deinit()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      this.$stylesContainer && this.$stylesContainer.setImage(this)
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this.$stylesContainer && this.$stylesContainer.setImage(undefined)
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      return this::style.methods.getServices()
+    },
+    /**
+     * @return {Promise}
+     */
+    refresh () {
+      // recreate style
+      return this.recreate()
+    },
+  },
   stubVNode: {
     empty: false,
     attrs () {
       return {
-        class: this.$options.name,
+        id: this.vmId,
+        class: this.cmpName,
       }
     },
   },
diff --git a/src/mixin/interaction.js b/src/mixin/interaction.js
index 38e9aed0..958f6e92 100644
--- a/src/mixin/interaction.js
+++ b/src/mixin/interaction.js
@@ -1,145 +1,177 @@
-import uuid from 'uuid/v4'
+import {
+  getInteractionId,
+  getInteractionPriority,
+  initializeInteraction,
+  setInteractionId,
+  setInteractionPriority,
+} from '../ol-ext'
+import { isEqual } from '../util/minilo'
 import mergeDescriptors from '../util/multi-merge-descriptors'
 import cmp from './ol-virt-cmp'
 import useMapCmp from './use-map-cmp'
 
-const props = {
-  id: {
-    type: [String, Number],
-    default: () => uuid(),
-  },
-  active: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * Priority of interactions in the event handling stream.
-   * The higher the value, the sooner it will handle map event.
-   * @type {number}
-   */
-  priority: {
-    type: Number,
-    default: 0,
+export default {
+  mixins: [cmp, useMapCmp],
+  props: {
+    active: {
+      type: Boolean,
+      default: true,
+    },
+    /**
+     * Priority of interactions in the event handling stream.
+     * The higher the value, the sooner it will handle map event.
+     * @type {number}
+     */
+    priority: {
+      type: Number,
+      default: 0,
+    },
   },
-}
+  methods: {
+    /**
+     * @return {Promise<module:ol/interaction/Interaction~Interaction>}
+     * @protected
+     */
+    async createOlObject () {
+      const interaction = await this.createInteraction()
 
-const methods = {
-  /**
-   * @return {Promise<Interaction>}
-   * @protected
-   */
-  async createOlObject () {
-    const interaction = await this.createInteraction()
-    interaction.setActive(this.active)
-    interaction.setProperties({
-      id: this.id,
-      priority: this.priority,
-    })
+      initializeInteraction(interaction, this.id, this.priority)
+      interaction.setActive(this.active)
 
-    return interaction
-  },
-  /**
-   * @return {Interaction|Promise<Interaction>}
-   * @protected
-   * @abstract
-   */
-  createInteraction () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+      return interaction
+    },
+    /**
+     * @return {module:ol/interaction/Interaction~Interaction|Promise<module:ol/interaction/Interaction~Interaction>}
+     * @protected
+     * @abstract
+     */
+    createInteraction () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
 
-    return mergeDescriptors(this::cmp.methods.getServices(), {
-      get interaction () { return vm.$interaction },
-    })
-  },
-  /**
-   * @return {Promise} Resolves when initialization completes
-   * @protected
-   */
-  init () {
-    return this::cmp.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::cmp.methods.deinit()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this.$interactionsContainer && this.$interactionsContainer.addInteraction(this)
-    this.subscribeAll()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.unsubscribeAll()
-    this.$interactionsContainer && this.$interactionsContainer.removeInteraction(this)
-  },
-  /**
-   * @return {Promise}
-   */
-  refresh () {
-    return this::cmp.methods.refresh()
+      return mergeDescriptors(this::cmp.methods.getServices(), {
+        get interaction () { return vm.$interaction },
+      })
+    },
+    /**
+     * @return {Promise} Resolves when initialization completes
+     * @protected
+     */
+    init () {
+      return this::cmp.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::cmp.methods.deinit()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      this.$interactionsContainer && this.$interactionsContainer.addInteraction(this)
+      this.subscribeAll()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this.unsubscribeAll()
+      this.$interactionsContainer && this.$interactionsContainer.removeInteraction(this)
+    },
+    /**
+     * @return {Promise}
+     */
+    refresh () {
+      return this::cmp.methods.refresh()
+    },
+    /**
+     * @return {Promise}
+     */
+    recreate () {
+      return this::cmp.methods.recreate()
+    },
+    /**
+     * @return {Promise}
+     */
+    remount () {
+      return this::cmp.methods.remount()
+    },
+    /**
+     * @protected
+     */
+    subscribeAll () {
+    },
   },
-}
+  watch: {
+    id (value) {
+      if (!this.$interaction || isEqual(value, getInteractionId(this.$interaction))) {
+        return
+      }
+
+      setInteractionId(this.$interaction, value)
+    },
+    active (value) {
+      if (!this.$interaction || value === this.$interaction.getActive()) {
+        return
+      }
 
-const watch = {
-  active (value) {
-    if (this.$interaction && value !== this.$interaction.getActive()) {
       this.$interaction.setActive(value)
-    }
-  },
-  priority (value) {
-    if (!this.$interactionsContainer) return
+    },
+    priority (value) {
+      if (
+        !this.$interaction ||
+        !this.$interactionsContainer ||
+        value === getInteractionPriority(this.$interaction)
+      ) {
+        return
+      }
 
-    this.$interaction.set('priority', value)
-    this.$interactionsContainer.sortInteractions()
+      setInteractionPriority(this.$interaction, value)
+      // todo replace with event
+      this.$interactionsContainer.sortInteractions()
+    },
   },
-}
-
-export default {
-  mixins: [cmp, useMapCmp],
-  props,
-  methods,
-  watch,
   stubVNode: {
     empty () {
-      return this.$options.name
+      return this.vmId
     },
   },
   created () {
-    Object.defineProperties(this, {
-      /**
-       * @type {Interaction|undefined}
-       */
-      $interaction: {
-        enumerable: true,
-        get: () => this.$olObject,
-      },
-      $map: {
-        enumerable: true,
-        get: () => this.$services && this.$services.map,
-      },
-      $view: {
-        enumerable: true,
-        get: () => this.$services && this.$services.view,
-      },
-      $interactionsContainer: {
-        enumerable: true,
-        get: () => this.$services && this.$services.interactionsContainer,
-      },
-    })
+    this::defineServices()
   },
 }
+
+function defineServices () {
+  Object.defineProperties(this, {
+    /**
+     * @type {module:ol/interaction/Interaction~Interaction|undefined}
+     */
+    $interaction: {
+      enumerable: true,
+      get: () => this.$olObject,
+    },
+    $map: {
+      enumerable: true,
+      get: () => this.$services && this.$services.map,
+    },
+    $view: {
+      enumerable: true,
+      get: () => this.$services && this.$services.view,
+    },
+    $interactionsContainer: {
+      enumerable: true,
+      get: () => this.$services && this.$services.interactionsContainer,
+    },
+  })
+}
diff --git a/src/mixin/interactions-container.js b/src/mixin/interactions-container.js
index d09eeeaa..fb214b4f 100644
--- a/src/mixin/interactions-container.js
+++ b/src/mixin/interactions-container.js
@@ -1,88 +1,137 @@
+import Collection from 'ol/Collection'
 import Interaction from 'ol/interaction/Interaction'
 import Vue from 'vue'
+import { merge as mergeObs } from 'rxjs/observable'
+import { getInteractionId, getInteractionPriority, initializeInteraction } from '../ol-ext'
 import { instanceOf } from '../util/assert'
+import rxSubs from './rx-subs'
+import { observableFromOlEvent } from '../rx-ext'
 
-const methods = {
-  /**
-   * @return {IndexedCollectionAdapter}
-   * @protected
-   */
-  getInteractionsTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @param {Interaction|Vue} interaction
-   * @return {void}
-   */
-  addInteraction (interaction) {
-    interaction = interaction instanceof Vue ? interaction.$interaction : interaction
-    instanceOf(interaction, Interaction)
+export default {
+  mixins: [rxSubs],
+  computed: {
+    interactionIds () {
+      if (!this.rev) return []
 
-    if (this.getInteractionsTarget().has(interaction) === false) {
-      this.getInteractionsTarget().add(interaction)
-      this.sortInteractions()
-    }
+      return this.getInteractions().map(getInteractionId)
+    },
   },
-  /**
-   * @param {Interaction|Vue} interaction
-   * @return {void}
-   */
-  removeInteraction (interaction) {
-    interaction = interaction instanceof Vue ? interaction.$interaction : interaction
+  methods: {
+    /**
+     * @param {Interaction|Vue} interaction
+     * @return {void}
+     */
+    addInteraction (interaction) {
+      interaction = interaction instanceof Vue ? interaction.$interaction : interaction
+      instanceOf(interaction, Interaction)
 
-    if (!interaction) return
+      if (this.getInteractionById(getInteractionId(interaction)) == null) {
+        initializeInteraction(interaction)
+        this.$interactionsCollection.push(interaction)
+        this.sortInteractions()
+      }
+    },
+    /**
+     * @param {Interaction|Vue} interaction
+     * @return {void}
+     */
+    removeInteraction (interaction) {
+      interaction = this.getInteractionById(getInteractionId(interaction))
+      if (!interaction) return
 
-    if (this.getInteractionsTarget().has(interaction)) {
-      this.getInteractionsTarget().remove(interaction)
+      this.$interactionsCollection.remove(interaction)
       this.sortInteractions()
-    }
-  },
-  /**
-   * @return {Interaction[]}
-   */
-  getInteractions () {
-    return this.getInteractionsTarget().elements
-  },
-  /**
-   * @param {string|number} id
-   * @return {Interaction|undefined}
-   */
-  getInteractionById (id) {
-    return this.getInteractionsTarget().findByKey(id)
-  },
-  /**
-   * @return {void}
-   */
-  sortInteractions (sorter) {
-    sorter || (sorter = this.getDefaultInteractionsSorter())
-    this.getInteractionsTarget().sort(sorter)
-  },
-  /**
-   * @return {function}
-   * @protected
-   */
-  getDefaultInteractionsSorter () {
-    return () => 0
-  },
-  /**
-   * @return {void}
-   */
-  clearInteractions () {
-    this.getInteractionsTarget().clear()
+    },
+    /**
+     * @return {Interaction[]}
+     */
+    getInteractions () {
+      return this.$interactionsCollection.getArray()
+    },
+    /**
+     * @return {Collection<Interaction>>}
+     */
+    getInteractionsCollection () {
+      return this._interactionsCollection
+    },
+    /**
+     * @param {string|number} interactionId
+     * @return {Interaction|undefined}
+     */
+    getInteractionById (interactionId) {
+      return this.$interactionsCollection.getArray().find(interaction => {
+        return getInteractionId(interaction) === interactionId
+      })
+    },
+    /**
+     * @return {void}
+     */
+    sortInteractions (sorter) {
+      sorter || (sorter = this.getDefaultInteractionsSorter())
+
+      this.$interactionsCollection.getArray().sort(sorter)
+    },
+    /**
+     * @return {function}
+     * @protected
+     */
+    getDefaultInteractionsSorter () {
+      // sort interactions by priority in asc order
+      // the higher the priority, the earlier the interaction handles the event
+      return (a, b) => {
+        let ap = getInteractionPriority(a) || 0
+        let bp = getInteractionPriority(b) || 0
+        return ap === bp ? 0 : ap - bp
+      }
+    },
+    /**
+     * @return {void}
+     */
+    clearInteractions () {
+      this.$interactionsCollection.clear()
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return {
+        get interactionsContainer () { return vm },
+      }
+    },
   },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+  created () {
+    /**
+     * @type {Collection<Interaction>>}
+     * @private
+     */
+    this._interactionsCollection = new Collection()
 
-    return {
-      get interactionsContainer () { return vm },
-    }
+    this::defineServices()
+    this::subscribeToCollectionEvents()
   },
 }
 
-export default {
-  methods,
+function defineServices () {
+  Object.defineProperties(this, {
+    $interactionsCollection: {
+      enumerable: true,
+      get: this.getInteractionsCollection,
+    },
+  })
+}
+
+function subscribeToCollectionEvents () {
+  const adds = observableFromOlEvent(this.$interactionsCollection, 'add')
+  const removes = observableFromOlEvent(this.$interactionsCollection, 'remove')
+
+  this.subscribeTo(mergeObs(adds, removes), ({ type, element }) => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(type + ':interaction', element)
+    })
+  })
 }
diff --git a/src/mixin/layer.js b/src/mixin/layer.js
index 0ab18d84..30bc7e4a 100644
--- a/src/mixin/layer.js
+++ b/src/mixin/layer.js
@@ -1,235 +1,272 @@
-import uuid from 'uuid/v4'
 import Vue from 'vue'
+import { getLayerId, initializeLayer, setLayerId } from '../ol-ext'
 import { hasLayer, hasMap } from '../util/assert'
 import { isEqual } from '../util/minilo'
 import mergeDescriptors from '../util/multi-merge-descriptors'
 import { observableFromOlEvent } from '../rx-ext'
+import { makeWatchers } from '../util/vue-helpers'
 import cmp from './ol-virt-cmp'
 import sourceContainer from './source-container'
 import useMapCmp from './use-map-cmp'
 
-const props = {
-  id: {
-    type: [String, Number],
-    default: () => uuid(),
-  },
-  /**
-   * The bounding extent for layer rendering defined in the map view projection.
-   * The layer will not be rendered outside of this extent.
-   * @default undefined
-   * @type {Extent|number[]|undefined}
-   */
-  extent: {
-    type: Array,
-    validator: value => value.length === 4,
-  },
-  minResolution: Number,
-  maxResolution: Number,
-  opacity: {
-    type: Number,
-    default: 1,
-  },
-  overlay: {
-    type: Boolean,
-    default: false,
-  },
-  visible: {
-    type: Boolean,
-    default: true,
+export default {
+  mixins: [cmp, useMapCmp, sourceContainer],
+  props: {
+    /**
+     * The bounding extent for layer rendering defined in the map view projection.
+     * The layer will not be rendered outside of this extent.
+     * @default undefined
+     * @type {number[]|undefined}
+     */
+    extent: {
+      type: Array,
+      validator: value => value.length === 4,
+    },
+    minResolution: Number,
+    maxResolution: Number,
+    opacity: {
+      type: Number,
+      default: 1,
+    },
+    overlay: {
+      type: Boolean,
+      default: false,
+    },
+    visible: {
+      type: Boolean,
+      default: true,
+    },
+    zIndex: Number,
   },
-  zIndex: Number,
-}
+  methods: {
+    /**
+     * @return {Promise<module:ol/layer/BaseLayer~BaseLayer>}
+     * @protected
+     */
+    async createOlObject () {
+      let layer = await this.createLayer()
 
-const methods = {
-  /**
-   * @return {Promise<Layer>}
-   * @protected
-   */
-  async createOlObject () {
-    let layer = await this.createLayer()
-    layer.set('id', this.id)
+      initializeLayer(layer, this.id)
 
-    return layer
-  },
-  /**
-   * @return {Layer|Promise<Layer>}
-   * @protected
-   * @abstract
-   */
-  createLayer () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Promise<Vue<Layer>>}
-   * @protected
-   */
-  init () {
-    return this::cmp.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::cmp.methods.deinit()
-  },
-  /**
-   * @param {number[]} pixel
-   * @return {boolean}
-   */
-  isAtPixel (pixel) {
-    hasMap(this)
-
-    return this.$map.forEachLayerAtPixel(pixel, l => l === this.$layer)
-  },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
-
-    return mergeDescriptors(
-      this::cmp.methods.getServices(),
-      this::sourceContainer.methods.getServices(),
-      {
-        get layer () { return vm.$layer },
-      },
-    )
-  },
-  /**
-   * @return {{
-   *     setSource: function(Source): void,
-   *     getSource: function(): Source
-   *   }|undefined}
-   * @protected
-   */
-  getSourceTarget () {
-    return this.$layer
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    if (this.overlay && this.$map) {
-      this.setMap(this.$map)
-    } else if (this.$layersContainer) {
-      this.$layersContainer.addLayer(this)
-    }
-
-    this.subscribeAll()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.unsubscribeAll()
-
-    if (this.overlay) {
-      this.setMap(undefined)
-    } else if (this.$layersContainer) {
-      this.$layersContainer.removeLayer(this)
-    }
-  },
-  /**
-   * Updates layer state
-   * @return {Promise}
-   */
-  refresh () {
-    return this::cmp.methods.refresh()
-  },
-  /**
-   * @param {Map|Vue|undefined} map
-   */
-  setMap (map) {
-    hasLayer(this)
-
-    map = map instanceof Vue ? map.$map : map
-    this.$layer.setMap(map)
-  },
-  subscribeAll () {
-    this::subscribeToLayerEvents()
-  },
-}
+      return layer
+    },
+    /**
+     * @return {module:ol/layer/BaseLayer~BaseLayer|Promise<module:ol/layer/BaseLayer~BaseLayer>}
+     * @protected
+     * @abstract
+     */
+    createLayer () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {Promise<Vue<module:ol/layer/BaseLayer~BaseLayer>>}
+     * @protected
+     */
+    init () {
+      return this::cmp.methods.init()
+    },
+    /**
+     * @return {void|Promise}
+     * @protected
+     */
+    deinit () {
+      return this::cmp.methods.deinit()
+    },
+    /**
+     * @param {number[]} pixel
+     * @return {boolean}
+     */
+    isAtPixel (pixel) {
+      hasMap(this)
+
+      return this.$map.forEachLayerAtPixel(pixel, layer => layer === this.$layer)
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return mergeDescriptors(
+        this::cmp.methods.getServices(),
+        this::sourceContainer.methods.getServices(),
+        {
+          get layer () { return vm.$layer },
+        },
+      )
+    },
+    /**
+     * @return {{
+     *     setSource: function(module:ol/source/Source~Source): void,
+     *     getSource: function(): module:ol/source/Source~Source
+     *   }|undefined}
+     * @protected
+     */
+    getSourceTarget () {
+      return this.$layer
+    },
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    mount () {
+      if (this.overlay && this.$map) {
+        this.setMap(this.$map)
+      } else if (this.$layersContainer) {
+        this.$layersContainer.addLayer(this)
+      }
+
+      return this::cmp.methods.mount()
+    },
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    unmount () {
+      if (this.overlay) {
+        this.setMap(undefined)
+      } else if (this.$layersContainer) {
+        this.$layersContainer.removeLayer(this)
+      }
+
+      return this::cmp.methods.unmount()
+    },
+    /**
+     * Updates layer state
+     * @return {Promise}
+     */
+    refresh () {
+      return this::cmp.methods.refresh()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise}
+     * @protected
+     */
+    remount () {
+      return this::cmp.methods.remount()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise}
+     * @protected
+     */
+    recreate () {
+      return this::cmp.methods.remount()
+    },
+    /**
+     * @protected
+     */
+    subscribeAll () {
+      this::cmp.methods.subscribeAll()
+      this::subscribeToLayerEvents()
+    },
+    /**
+     * @param {module:ol/Map~Map|Vue|undefined} map
+     */
+    setMap (map) {
+      hasLayer(this)
 
-const watch = {
-  id (value) {
-    if (this.$layer && value !== this.$layer.get('id')) {
-      this.$layer.set('id', value)
-    }
+      map = map instanceof Vue ? map.$map : map
+
+      this.$layer.setMap(map)
+    },
   },
-  maxResolution (value) {
-    if (this.$layer && value !== this.$layer.getMaxResolution()) {
+  watch: {
+    id (value) {
+      if (!this.$layer || value === getLayerId(this.$layer)) {
+        return
+      }
+
+      setLayerId(this.$layer, value)
+    },
+    maxResolution (value) {
+      if (!this.$layer || value === this.$layer.getMaxResolution()) {
+        return
+      }
+
       this.$layer.setMaxResolution(value)
-    }
-  },
-  minResolution (value) {
-    if (this.$layer && value !== this.$layer.getMinResolution()) {
+    },
+    minResolution (value) {
+      if (!this.$layer || value === this.$layer.getMinResolution()) {
+        return
+      }
+
       this.$layer.setMinResolution(value)
-    }
-  },
-  opacity (value) {
-    if (this.$layer && value !== this.$layer.getOpacity()) {
+    },
+    opacity (value) {
+      if (!this.$layer || value === this.$layer.getOpacity()) {
+        return
+      }
+
       this.$layer.setOpacity(value)
-    }
-  },
-  visible (value) {
-    if (this.$layer && value !== this.$layer.getVisible()) {
+    },
+    visible (value) {
+      if (!this.$layer || value === this.$layer.getVisible()) {
+        return
+      }
+
       this.$layer.setVisible(value)
-    }
-  },
-  zIndex (value) {
-    if (this.$layer && value !== this.$layer.getZIndex()) {
+    },
+    zIndex (value) {
+      if (!this.$layer || value === this.$layer.getZIndex()) {
+        return
+      }
+
       this.$layer.setZIndex(value)
-    }
-  },
-  extent (value) {
-    if (this.$layer && !isEqual(value, this.$layer.getExtent())) {
+    },
+    extent (value) {
+      if (!this.$layer || isEqual(value, this.$layer.getExtent())) {
+        return
+      }
+
       this.$layer.setExtent(value)
-    }
+    },
+    ...makeWatchers([
+      'overlay',
+    ], () => function () {
+      this.scheduleRecreate()
+    }),
   },
-}
-
-export default {
-  mixins: [cmp, useMapCmp, sourceContainer],
-  props,
-  methods,
-  watch,
   stubVNode: {
     attrs () {
       return {
-        id: [this.$options.name, this.id].join('-'),
-        class: this.$options.name,
+        id: this.vmId,
+        class: this.cmpName,
       }
     },
   },
   created () {
-    Object.defineProperties(this, {
-      /**
-       * @type {Layer|undefined}
-       */
-      $layer: {
-        enumerable: true,
-        get: () => this.$olObject,
-      },
-      $map: {
-        enumerable: true,
-        get: () => this.$services && this.$services.map,
-      },
-      $view: {
-        enumerable: true,
-        get: () => this.$services && this.$services.view,
-      },
-      $layersContainer: {
-        enumerable: true,
-        get: () => this.$services && this.$services.layersContainer,
-      },
-    })
+    this::defineServices()
   },
 }
 
+function defineServices () {
+  Object.defineProperties(this, {
+    $layer: {
+      enumerable: true,
+      get: () => this.$olObject,
+    },
+    $source: {
+      enumerable: true,
+      get: this.getSource,
+    },
+    $map: {
+      enumerable: true,
+      get: () => this.$services && this.$services.map,
+    },
+    $view: {
+      enumerable: true,
+      get: () => this.$services && this.$services.view,
+    },
+    $layersContainer: {
+      enumerable: true,
+      get: () => this.$services && this.$services.layersContainer,
+    },
+  })
+}
+
 function subscribeToLayerEvents () {
   hasLayer(this)
 
@@ -239,5 +276,11 @@ function subscribeToLayerEvents () {
     'render',
   ])
 
-  this.subscribeTo(events, evt => this.$emit(evt.type, evt))
+  this.subscribeTo(events, evt => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(evt.type, evt)
+    })
+  })
 }
diff --git a/src/mixin/layers-container.js b/src/mixin/layers-container.js
index 6a018dc2..fb5d8864 100644
--- a/src/mixin/layers-container.js
+++ b/src/mixin/layers-container.js
@@ -1,72 +1,114 @@
+import Collection from 'ol/Collection'
 import BaseLayer from 'ol/layer/Base'
 import Vue from 'vue'
+import { merge as mergeObs } from 'rxjs/observable'
+import { getLayerId, initializeLayer } from '../ol-ext'
+import { observableFromOlEvent } from '../rx-ext'
 import { instanceOf } from '../util/assert'
+import rxSubs from './rx-subs'
 
-const methods = {
-  /**
-   * @return {IndexedCollectionAdapter}
-   * @protected
-   */
-  getLayersTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @param {Layer|Vue} layer
-   * @return {void}
-   */
-  addLayer (layer) {
-    layer = layer instanceof Vue ? layer.$layer : layer
-    instanceOf(layer, BaseLayer)
+export default {
+  mixins: [rxSubs],
+  computed: {
+    layerIds () {
+      if (!this.rev) return []
 
-    if (this.getLayersTarget().has(layer) === false) {
-      this.getLayersTarget().add(layer)
-    }
+      return this.getLayers().map(getLayerId)
+    },
   },
-  /**
-   * @param {Layer|Vue} layer
-   * @return {void}
-   */
-  removeLayer (layer) {
-    layer = layer instanceof Vue ? layer.$layer : layer
+  methods: {
+    /**
+     * @param {BaseLayer|Vue} layer
+     * @return {void}
+     */
+    addLayer (layer) {
+      layer = layer instanceof Vue ? layer.$layer : layer
+      instanceOf(layer, BaseLayer)
 
-    if (!layer) return
+      if (this.getLayerById(getLayerId(layer)) == null) {
+        initializeLayer(layer)
+        this.$layersCollection.push(layer)
+      }
+    },
+    /**
+     * @param {BaseLayer|Vue} layer
+     * @return {void}
+     */
+    removeLayer (layer) {
+      layer = this.getLayerById(getLayerId(layer))
+      if (!layer) return
 
-    if (this.getLayersTarget().has(layer)) {
-      this.getLayersTarget().remove(layer)
-    }
-  },
-  /**
-   * @return {Layer[]}
-   */
-  getLayers () {
-    return this.getLayersTarget().elements
-  },
-  /**
-   * @param {string|number} id
-   * @return {Layer|undefined}
-   */
-  getLayerById (id) {
-    return this.getLayersTarget().findByKey(id)
-  },
-  /**
-   * @return {void}
-   */
-  clearLayers () {
-    this.getLayersTarget().clear()
+      this.$layersCollection.remove(layer)
+    },
+    /**
+     * @return {BaseLayer[]}
+     */
+    getLayers () {
+      return this.$layersCollection.getArray()
+    },
+    /**
+     * @return {module:ol/Collection~Collection<BaseLayer>}
+     */
+    getLayersCollection () {
+      return this._layersCollection
+    },
+    /**
+     * @param {string|number} layerId
+     * @return {BaseLayer|undefined}
+     */
+    getLayerById (layerId) {
+      return this.$layersCollection.getArray().find(layer => {
+        return getLayerId(layer) === layerId
+      })
+    },
+    /**
+     * @return {void}
+     */
+    clearLayers () {
+      this.$layersCollection.clear()
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return {
+        get layersContainer () { return vm },
+      }
+    },
   },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+  created () {
+    /**
+     * @type {Collection<BaseLayer>}
+     * @private
+     */
+    this._layersCollection = new Collection()
 
-    return {
-      get layersContainer () { return vm },
-    }
+    this::defineServices()
+    this::subscribeToCollectionEvents()
   },
 }
 
-export default {
-  methods,
+function defineServices () {
+  Object.defineProperties(this, {
+    $layersCollection: {
+      enumerable: true,
+      get: this.getLayersCollection,
+    },
+  })
+}
+
+function subscribeToCollectionEvents () {
+  const adds = observableFromOlEvent(this.$layersCollection, 'add')
+  const removes = observableFromOlEvent(this.$layersCollection, 'remove')
+
+  this.subscribeTo(mergeObs(adds, removes), ({ type, element }) => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(type + ':layer', element)
+    })
+  })
 }
diff --git a/src/mixin/ol-cmp.js b/src/mixin/ol-cmp.js
index 12c2e3a6..b903f4bc 100644
--- a/src/mixin/ol-cmp.js
+++ b/src/mixin/ol-cmp.js
@@ -1,256 +1,277 @@
-import { interval as intervalObs } from 'rxjs/observable'
-import { first as firstObs, map as mapObs, skipWhile } from 'rxjs/operators'
 import debounce from 'debounce-promise'
-import { isFunction } from '../util/minilo'
+import { interval as intervalObs } from 'rxjs/observable'
+import { first as firstObs, skipUntil, skipWhile } from 'rxjs/operators'
+import uuid from 'uuid/v4'
+import { log } from '../util/log'
+import { identity, isFunction } from '../util/minilo'
 import identMap from './ident-map'
 import rxSubs from './rx-subs'
 import services from './services'
 
 const VM_PROP = 'vm'
 const INSTANCE_PROMISE_POOL = 'instance_promise'
-/**
- * @vueProps
- */
-const props = {}
-/**
- * @vueMethods
- */
-const methods = {
-  /**
-   * @return {Promise<void>}
-   * @protected
-   */
-  beforeInit () {},
-  /**
-   * @return {Promise} Resolves when initialization completes
-   * @protected
-   */
-  async init () {
-    let createPromise
-
-    const ident = this.makeSelfIdent()
-    if (ident && this.$identityMap.has(ident, INSTANCE_PROMISE_POOL)) {
-      createPromise = this.$identityMap.get(ident, INSTANCE_PROMISE_POOL)
-    } else {
-      createPromise = Promise.resolve(this.createOlObject())
-
-      if (ident) {
-        this.$identityMap.set(ident, createPromise, INSTANCE_PROMISE_POOL)
-      }
-    }
-
-    this._olObject = await createPromise
-    this._olObject[VM_PROP] || (this._olObject[VM_PROP] = [])
-
-    if (!this._olObject[VM_PROP].includes(this)) { // for loaded from IdentityMap
-      this._olObject[VM_PROP].push(this)
-    }
-
-    ++this.rev
-  },
-  /**
-   * @return {*|Promise<T>}
-   * @protected
-   * @abstract
-   */
-  createOlObject () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    const ident = this.makeSelfIdent()
-    if (ident) {
-      this.$identityMap.unset(ident, INSTANCE_PROMISE_POOL)
-    }
-    if (this._olObject) {
-      this._olObject[VM_PROP] = this._olObject[VM_PROP].filter(vm => vm !== this)
-      this._olObject = undefined
-    }
-  },
-  /**
-   * Redefine for easy call in child components
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    return this::services.methods.getServices()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   * @abstract
-   */
-  mount () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   * @abstract
-   */
-  unmount () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * Refresh internal ol objects
-   * @return {Promise<void>}
-   */
-  refresh () {
-    if (this.$olObject == null) return Promise.resolve()
-
-    return new Promise(resolve => {
-      let done = () => {
-        ++this.rev
-        resolve()
-      }
-      if (this.$olObject && isFunction(this.$olObject.changed)) {
-        this.$olObject.once('change', done)
-        this.$olObject.changed()
-      } else {
-        done()
-      }
-    })
-  },
-  /**
-   * Internal usage only in components that doesn't support refreshing.
-   * @return {Promise<void>}
-   * @protected
-   */
-  remount () {
-    if (this.$olObject == null) return Promise.resolve()
-
-    return Promise.resolve(this.unmount())
-      .then(() => this.mount())
-  },
-  /**
-   * Only for internal purpose to support watching for properties
-   * for which OpenLayers doesn't provide setters.
-   * @return {Promise}
-   * @protected
-   */
-  recreate () {
-    if (this.$olObject == null) return Promise.resolve()
-
-    return Promise.resolve(this.unmount())
-      .then(() => this.deinit())
-      .then(() => this.init())
-      .then(() => this.mount())
-  },
-}
 
 /**
  * Basic ol component mixin.
- *
- * @title olCmp
- * @vueProto
- * @alias module:mixin/ol-cmp
- *
- * @fires module:mixin/ol-cmp#created
- * @fires module:mixin/ol-cmp#mounted
- * @fires module:mixin/ol-cmp#destroyed
+ * todo try to subscribe to generic change event here and update rev according to internal ol counter
  */
 export default {
   VM_PROP,
   INSTANCE_PROMISE_POOL,
   mixins: [identMap, rxSubs, services],
-  props,
-  methods,
-  /**
-   * @this module:mixin/ol-cmp
-   */
+  props: {
+    id: {
+      type: [String, Number],
+      default: () => uuid(),
+    },
+  },
   data () {
-    return /** @lends module:mixin/ol-cmp# */{
+    return {
       rev: 0,
     }
   },
-  created () {
+  computed: {
+    cmpName () {
+      return this.$options.name
+    },
+    vmId () {
+      return [this.cmpName, this.id].filter(identity).join('-')
+    },
+    vmName () {
+      return [this.cmpName, this.id].filter(identity).join(' ')
+    },
+  },
+  methods: {
     /**
-     * @type {*}
-     * @private
+     * @return {Promise<void>}
+     * @protected
      */
-    this._olObject = undefined
+    beforeInit () {},
     /**
-     * @type {Promise<Vue<T>>}
-     * @private
+     * @return {Promise<void>} Resolves when initialization completes
+     * @protected
+     */
+    async init () {
+      let createPromise
+
+      const ident = this.makeSelfIdent()
+      if (ident && this.$identityMap.has(ident, INSTANCE_PROMISE_POOL)) {
+        createPromise = this.$identityMap.get(ident, INSTANCE_PROMISE_POOL)
+      } else {
+        createPromise = this.createOlObject()
+
+        if (ident) {
+          this.$identityMap.set(ident, createPromise, INSTANCE_PROMISE_POOL)
+        }
+      }
+
+      this._olObject = await createPromise
+      this._olObject[VM_PROP] || (this._olObject[VM_PROP] = [])
+
+      if (!this._olObject[VM_PROP].includes(this)) { // for loaded from IdentityMap
+        this._olObject[VM_PROP].push(this)
+      }
+
+      ++this.rev
+    },
+    /**
+     * @return {module:ol/Object~BaseObject|Promise<module:ol/Object~BaseObject>}
+     * @protected
+     * @abstract
+     */
+    createOlObject () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      const ident = this.makeSelfIdent()
+      if (ident) {
+        this.$identityMap.unset(ident, INSTANCE_PROMISE_POOL)
+      }
+      if (this._olObject) {
+        this._olObject[VM_PROP] = this._olObject[VM_PROP].filter(vm => vm !== this)
+        this._olObject = undefined
+      }
+    },
+    /**
+     * Redefine for easy call in child components
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      return this::services.methods.getServices()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    mount () {
+      this.subscribeAll()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    unmount () {
+      this.unsubscribeAll()
+    },
+    /**
+     * Refresh internal ol objects
+     * @return {Promise<void>}
      */
-    this._createPromise = Promise.resolve(this.beforeInit())
-      .then(this.init)
-      .then(() => {
-        // logdbg('created', this.$options.name)
-        this.$emit('created', this)
-        return this
+    refresh () {
+      if (this.$olObject == null) return Promise.resolve()
+
+      return new Promise(resolve => {
+        if (this.$olObject && isFunction(this.$olObject.changed)) {
+          this.$olObject.once('change', () => resolve())
+          this.$olObject.changed()
+        } else {
+          resolve()
+        }
       })
+    },
     /**
-     * @type {Promise<Vue<T>>}
-     * @private
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise<void>}
+     * @protected
      */
-    this._mountPromise = intervalObs(100).pipe(
-      skipWhile(() => !this._mounted),
-      firstObs(),
-      mapObs(() => this),
-    ).toPromise(Promise)
+    async remount () {
+      if (this.$olObject == null) return
 
+      await this.unmount()
+      await this.mount()
+    },
+    /**
+     * Only for internal purpose to support watching for properties
+     * for which OpenLayers doesn't provide setters.
+     * @return {Promise}
+     * @protected
+     */
+    async recreate () {
+      if (this.$olObject == null) return
+
+      await this.unmount()
+      await this.deinit()
+      await this.init()
+      await this.mount()
+    },
+    subscribeAll () {},
+  },
+  created () {
+    /**
+     * @type {module:ol/Object~BaseObject}
+     * @private
+     */
+    this._olObject = undefined
     Object.defineProperties(this, {
       $olObject: {
         enumerable: true,
         get: () => this._olObject,
       },
-      $createPromise: {
-        enumerable: true,
-        get: () => this._createPromise,
-      },
-      $mountPromise: {
-        enumerable: true,
-        get: () => this._mountPromise,
-      },
     })
 
-    // bind debounced functions at runtime
-    // for each instance to avoid interfering between
-    // different instances
-    this.scheduleRefresh = debounce(function () {
-      return this.refresh()
-    }, 10)
-    this.scheduleRemount = debounce(function () {
-      return this.remount()
-    }, 10)
-    this.scheduleRecreate = debounce(function () {
-      return this.recreate()
-    }, 10)
+    this::defineLifeCyclePromises()
+    this::defineDebouncedHelpers()
   },
-  mounted () {
-    this.$createPromise.then(this.mount)
-      .then(() => {
-        this._mounted = true
-        this.$emit('mounted', this)
-        // logdbg('mounted', this.$options.name)
-      })
+  async mounted () {
+    await this.$createPromise
+
+    this._mounted = true
   },
-  destroyed () {
-    this.$mountPromise.then(this.unmount)
-      .then(this.deinit)
-      .then(() => {
-        this.$emit('destroyed', this)
-        // logdbg('destroyed', this.$options.name)
-      })
+  async beforeDestroy () {
+    await this.$mountPromise
+
+    this._mounted = false
+  },
+  async destroyed () {
+    await this.$unmountPromise
+
+    this._destroyed = true
   },
 }
 
-/**
- * Emitted when underlying **OpenLayers** instance created.
- * @event module:mixin/ol-cmp#created
- * @type {void}
- */
-/**
- * Emitted when underlying **OpenLayers** instance mounted to parent.
- * @event module:mixin/ol-cmp#mounted
- * @type {void}
- */
-/**
- * Emitted when underlying **OpenLayers** instance destroyed.
- * @event module:mixin/ol-cmp#destroyed
- * @type {void}
- */
+function defineLifeCyclePromises () {
+  const makeEventEmitter = event => () => {
+    this.$emit(event, this)
+
+    if (process.env.VUELAYERS_DEBUG) {
+      log(event, this.vmName)
+    }
+
+    return this
+  }
+  // create
+  this._createPromise = Promise.resolve(this.beforeInit())
+    .then(() => this.init())
+    .then(makeEventEmitter('created'))
+
+  // mount
+  const mountObs = intervalObs(1000 / 60)
+    .pipe(
+      skipWhile(() => !this._mounted),
+      firstObs(),
+    )
+  this._mountPromise = mountObs.toPromise(Promise)
+    .then(() => this.mount())
+    .then(makeEventEmitter('mounted'))
+
+  // unmount
+  const unmountObs = intervalObs(1000 / 60)
+    .pipe(
+      skipUntil(mountObs),
+      skipWhile(() => this._mounted),
+      firstObs(),
+    )
+  this._unmountPromise = unmountObs.toPromise(Promise)
+    .then(() => this.unmount())
+    .then(makeEventEmitter('unmounted'))
+
+  // destroy
+  const destroyObs = intervalObs(1000 / 60)
+    .pipe(
+      skipWhile(() => !this._destroyed),
+      firstObs(),
+    )
+  this._destroyPromise = destroyObs.toPromise(Promise)
+    .then(() => this.deinit())
+    .then(makeEventEmitter('destroyed'))
+
+  Object.defineProperties(this, {
+    $createPromise: {
+      enumerable: true,
+      get: () => this._createPromise,
+    },
+    $mountPromise: {
+      enumerable: true,
+      get: () => this._mountPromise,
+    },
+    $unmountPromise: {
+      enumerable: true,
+      get: () => this._unmountPromise,
+    },
+    $destroyPromise: {
+      enumerable: true,
+      get: () => this._destroyPromise,
+    },
+  })
+}
+
+function defineDebouncedHelpers () {
+  const t = 1000 / 10
+  // bind debounced functions at runtime
+  // for each instance to avoid interfering between
+  // different instances
+  this.scheduleRefresh = debounce(function () {
+    return this.refresh()
+  }, t)
+  this.scheduleRemount = debounce(function () {
+    return this.remount()
+  }, t)
+  this.scheduleRecreate = debounce(function () {
+    return this.recreate()
+  }, t)
+}
diff --git a/src/mixin/ol-virt-cmp.js b/src/mixin/ol-virt-cmp.js
index 7c0d1c17..433b9d0d 100644
--- a/src/mixin/ol-virt-cmp.js
+++ b/src/mixin/ol-virt-cmp.js
@@ -29,6 +29,20 @@ export default {
     createOlObject () {
       throw new Error('Not implemented method')
     },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    mount () {
+      return this::cmp.methods.mount()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    unmount () {
+      return this::cmp.methods.unmount()
+    },
     /**
      * Redefine for easy call in child components
      * @returns {Object}
@@ -44,5 +58,35 @@ export default {
     refresh () {
       return this::cmp.methods.refresh()
     },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise<void>}
+     * @protected
+     */
+    remount () {
+      return this::cmp.methods.remount()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise<void>}
+     * @protected
+     */
+    recreate () {
+      return this::cmp.methods.recreate()
+    },
+    /**
+     * @protected
+     */
+    subscribeAll () {
+      this::cmp.methods.subscribeAll()
+    },
+  },
+  stubVNode: {
+    attrs () {
+      return {
+        id: this.vmId,
+        class: this.cmpName,
+      }
+    },
   },
 }
diff --git a/src/mixin/overlays-container.js b/src/mixin/overlays-container.js
index 3980a761..8ab6e100 100644
--- a/src/mixin/overlays-container.js
+++ b/src/mixin/overlays-container.js
@@ -1,72 +1,114 @@
+import Collection from 'ol/Collection'
 import Overlay from 'ol/Overlay'
 import Vue from 'vue'
+import { merge as mergeObs } from 'rxjs/observable'
+import { getOverlayId, initializeOverlay } from '../ol-ext'
+import { observableFromOlEvent } from '../rx-ext'
 import { instanceOf } from '../util/assert'
+import rxSubs from './rx-subs'
 
-const methods = {
-  /**
-   * @return {IndexedCollectionAdapter}
-   * @protected
-   */
-  getOverlaysTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @param {Overlay|Vue} overlay
-   * @return {void}
-   */
-  addOverlay (overlay) {
-    overlay = overlay instanceof Vue ? overlay.$overlay : overlay
-    instanceOf(overlay, Overlay)
+export default {
+  mixins: [rxSubs],
+  computed: {
+    overlayIds () {
+      if (!this.rev) return []
 
-    if (this.getOverlaysTarget().has(overlay) === false) {
-      this.getOverlaysTarget().add(overlay)
-    }
+      return this.getOverlays().map(getOverlayId)
+    },
   },
-  /**
-   * @param {Overlay|Vue} overlay
-   * @return {void}
-   */
-  removeOverlay (overlay) {
-    overlay = overlay instanceof Vue ? overlay.$overlay : overlay
+  methods: {
+    /**
+     * @param {Overlay|Vue} overlay
+     * @return {void}
+     */
+    addOverlay (overlay) {
+      overlay = overlay instanceof Vue ? overlay.$overlay : overlay
+      instanceOf(overlay, Overlay)
 
-    if (!overlay) return
+      if (this.getOverlayById(getOverlayId(overlay)) == null) {
+        initializeOverlay(overlay)
+        this.$overlaysCollection.push(overlay)
+      }
+    },
+    /**
+     * @param {Overlay|Vue} overlay
+     * @return {void}
+     */
+    removeOverlay (overlay) {
+      overlay = this.getOverlayById(getOverlayId(overlay))
+      if (!overlay) return
 
-    if (this.getOverlaysTarget().has(overlay)) {
-      this.getOverlaysTarget().remove(overlay)
-    }
-  },
-  /**
-   * @return {Overlay[]}
-   */
-  getOverlays () {
-    return this.getOverlaysTarget().elements
-  },
-  /**
-   * @param {string|number} id
-   * @return {Overlay|undefined}
-   */
-  getOverlayById (id) {
-    return this.getOverlaysTarget().findByKey(id)
-  },
-  /**
-   * @return {void}
-   */
-  clearOverlays () {
-    this.getOverlaysTarget().clear()
+      this.$overlaysCollection.remove(overlay)
+    },
+    /**
+     * @return {Overlay[]}
+     */
+    getOverlays () {
+      return this.$overlaysCollection.getArray()
+    },
+    /**
+     * @return {Collection<Overlay>}
+     */
+    getOverlaysCollection () {
+      return this._overlaysCollection
+    },
+    /**
+     * @param {string|number} overlayId
+     * @return {Overlay|undefined}
+     */
+    getOverlayById (overlayId) {
+      return this.$overlaysCollection.getArray().find(overlay => {
+        return getOverlayId(overlay) === overlayId
+      })
+    },
+    /**
+     * @return {void}
+     */
+    clearOverlays () {
+      this.$overlaysCollection.clear()
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return {
+        get overlaysContainer () { return vm },
+      }
+    },
   },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+  created () {
+    /**
+     * @type {Collection<Overlay>}
+     * @private
+     */
+    this._overlaysCollection = new Collection()
 
-    return {
-      get overlaysContainer () { return vm },
-    }
+    this::defineServices()
+    this::subscribeToCollectionEvents()
   },
 }
 
-export default {
-  methods,
+function defineServices () {
+  Object.defineProperties(this, {
+    $overlaysCollection: {
+      enumerable: true,
+      get: this.getOverlaysCollection,
+    },
+  })
+}
+
+function subscribeToCollectionEvents () {
+  const adds = observableFromOlEvent(this.$overlaysCollection, 'add')
+  const removes = observableFromOlEvent(this.$overlaysCollection, 'remove')
+
+  this.subscribeTo(mergeObs(adds, removes), ({ type, element }) => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(type + ':overlay', element)
+    })
+  })
 }
diff --git a/src/mixin/proj-transforms.js b/src/mixin/proj-transforms.js
index 73a7d730..8bb674da 100644
--- a/src/mixin/proj-transforms.js
+++ b/src/mixin/proj-transforms.js
@@ -1,6 +1,8 @@
-import { EPSG_3857 } from '../ol-ext/consts'
-import { readGeoJsonFeature, readGeoJsonGeometry, writeGeoJsonFeature, writeGeoJsonGeometry } from '../ol-ext/geojson'
 import {
+  EPSG_3857,
+  getMapDataProjection,
+  readGeoJsonFeature,
+  readGeoJsonGeometry,
   transformExtent,
   transformLine,
   transformMultiLine,
@@ -8,32 +10,33 @@ import {
   transformMultiPolygon,
   transformPoint,
   transformPolygon,
-} from '../ol-ext/proj'
+  writeGeoJsonFeature,
+  writeGeoJsonGeometry,
+} from '../ol-ext'
 import { coalesce } from '../util/minilo'
 
 /**
  * Mixin with helpers for projection transforms between current view projection and global defined projection.
  */
-
 export default {
   computed: {
     /**
-     * @return {ProjectionLike}
+     * @return {module:ol/proj~ProjectionLike}
      */
     viewProjection () {
       if (this.rev && this.$view) {
         return this.$view.getProjection().getCode()
       }
-      return EPSG_3857
+      return this.projection || EPSG_3857
     },
     /**
-     * @return {ProjectionLike}
+     * @return {module:ol/proj~ProjectionLike}
      */
     resolvedDataProjection () {
       return coalesce(
         this.dataProjection, // may or may not be present
         this.projection, // may or may not be present
-        this.$map && this.$map.get('dataProjection'),
+        this.$map && getMapDataProjection(this.$map),
         this.$options.dataProjection,
         this.viewProjection,
       )
diff --git a/src/mixin/rx-subs.js b/src/mixin/rx-subs.js
index 00d8ca50..3f7a5037 100644
--- a/src/mixin/rx-subs.js
+++ b/src/mixin/rx-subs.js
@@ -1,6 +1,5 @@
 import { error as logError } from '../util/log'
-
-const noop = () => {}
+import { noop } from '../util/minilo'
 
 /**
  * RxJS subscriptions manager.
@@ -41,6 +40,13 @@ export default {
 
       return subs
     },
+    unsubscribe (subs) {
+      const idx = this._rxSubs.indexOf(subs)
+      if (idx === -1) return
+
+      subs.unsubscribe()
+      this._rxSubs.splice(idx, 1)
+    },
   },
   beforeCreate () {
     /**
diff --git a/src/mixin/services.js b/src/mixin/services.js
index 3be4feae..e1303a6d 100644
--- a/src/mixin/services.js
+++ b/src/mixin/services.js
@@ -3,6 +3,7 @@ import mergeDescriptors from '../util/multi-merge-descriptors'
 // todo uncomment when IE 11 will die
 // const SERVICES_PROP = Symbol('services')
 const SERVICES_PROP = 'services'
+
 /**
  * Service container mixin
  */
diff --git a/src/mixin/source-container.js b/src/mixin/source-container.js
index decd5e60..5dbeec41 100644
--- a/src/mixin/source-container.js
+++ b/src/mixin/source-container.js
@@ -1,60 +1,50 @@
 import Vue from 'vue'
 
-const methods = {
-  /**
-   * @return {{
-   *     setSource: function(Source): void,
-   *     getSource: function(): Source
-   *   }|undefined}
-   * @protected
-   */
-  getSourceTarget () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Source|undefined}
-   */
-  getSource () {
-    return this._source
-  },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
-
-    return {
-      get sourceContainer () { return vm },
-    }
-  },
-  /**
-   * @param {Source|Vue|undefined} source
-   * @return {void}
-   */
-  setSource (source) {
-    source = source instanceof Vue ? source.$source : source
-
-    if (source !== this._source) {
-      this._source = source
-    }
+export default {
+  methods: {
     /**
-     * @type {Layer|Builder}
+     * @return {{
+     *     setSource: function(module:ol/source/Source~Source): void,
+     *     getSource: function(): module:ol/source/Source~Source
+     *   }|undefined}
+     * @protected
      */
-    const sourceTarget = this.getSourceTarget()
-    if (sourceTarget && source !== sourceTarget.getSource()) {
-      sourceTarget.setSource(source)
-    }
-  },
-}
+    getSourceTarget () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {module:ol/source/Source~Source|undefined}
+     */
+    getSource () {
+      return this._source
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
 
-export default {
-  methods,
-  created () {
+      return {
+        get sourceContainer () { return vm },
+      }
+    },
     /**
-     * @type {Source|undefined}
-     * @private
+     * @param {module:ol/source/Source~Source|Vue|undefined} source
+     * @return {void}
      */
-    this._source = undefined
+    setSource (source) {
+      source = source instanceof Vue ? source.$source : source
+      if (source !== this._source) {
+        this._source = source
+      }
+      /**
+       * @type {module:ol/layer/Layer~Layer|Builder}
+       */
+      const sourceTarget = this.getSourceTarget()
+      if (sourceTarget && source !== sourceTarget.getSource()) {
+        sourceTarget.setSource(source)
+      }
+    },
   },
 }
diff --git a/src/mixin/source.js b/src/mixin/source.js
index c0715fdc..5d210025 100644
--- a/src/mixin/source.js
+++ b/src/mixin/source.js
@@ -1,135 +1,206 @@
-import { isFunction } from '../util/minilo'
+import { getSourceId, initializeSource, setSourceId } from '../ol-ext'
+import { isArray, isEqual, isString } from '../util/minilo'
 import mergeDescriptors from '../util/multi-merge-descriptors'
 import cmp from './ol-virt-cmp'
 import useMapCmp from './use-map-cmp'
 
-const props = {
-  attributions: [String, Array],
-  logo: String,
-  projection: String,
-  wrapX: {
-    type: Boolean,
-    default: true,
+export default {
+  mixins: [cmp, useMapCmp],
+  props: {
+    attributions: {
+      type: [String, Array],
+      validator: value => isString(value) || (isArray(value) && value.every(isString)),
+    },
+    attributionsCollapsible: {
+      type: Boolean,
+      default: true,
+    },
+    projection: String,
+    wrapX: {
+      type: Boolean,
+      default: true,
+    },
   },
-}
+  computed: {
+    state () {
+      if (!this.rev || !this.$source) {
+        return
+      }
 
-const methods = {
-  /**
-   * @return {Source|Promise<Source>}
-   * @protected
-   */
-  createOlObject () {
-    return this.createSource()
-  },
-  /**
-   * @return {Source|Promise<Source>}
-   * @protected
-   * @abstract
-   */
-  createSource () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
-    return this::cmp.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::cmp.methods.deinit()
+      return this.$source.getState()
+    },
   },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
+  methods: {
+    /**
+     * @return {module:ol/source/Source~Source|Promise<module:ol/source/Source~Source>}
+     * @protected
+     */
+    async createOlObject () {
+      const source = await this.createSource()
 
-    return mergeDescriptors(this::cmp.methods.getServices(), {
-      get source () { return vm.$source },
-    })
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this.$sourceContainer && this.$sourceContainer.setSource(this)
-    this.subscribeAll()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.unsubscribeAll()
-    this.$sourceContainer && this.$sourceContainer.setSource(undefined)
+      initializeSource(source, this.id)
+
+      return source
+    },
+    /**
+     * @return {module:ol/source/Source~Source|Promise<module:ol/source/Source~Source>}
+     * @protected
+     * @abstract
+     */
+    createSource () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    init () {
+      return this::cmp.methods.init()
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    deinit () {
+      return this::cmp.methods.deinit()
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
+
+      return mergeDescriptors(this::cmp.methods.getServices(), {
+        get source () { return vm.$source },
+      })
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    mount () {
+      this.$sourceContainer && this.$sourceContainer.setSource(this)
+
+      return this::cmp.methods.mount()
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    unmount () {
+      this.$sourceContainer && this.$sourceContainer.setSource(undefined)
+
+      return this::cmp.methods.unmount()
+    },
+    /**
+     * @return {Promise}
+     */
+    refresh () {
+      if (!this.$source) return Promise.resolve()
+
+      return new Promise(resolve => {
+        if (this.$source) {
+          this.$source.once('change', () => resolve)
+          this.$source.refresh()
+        } else {
+          resolve()
+        }
+      })
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise}
+     * @protected
+     */
+    remount () {
+      return this::cmp.methods.remount()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise}
+     * @protected
+     */
+    recreate () {
+      return this::cmp.methods.recreate()
+    },
+    /**
+     * @protected
+     */
+    subscribeAll () {
+      this::cmp.methods.subscribeAll()
+    },
   },
-  /**
-   * @return {Promise<void>}
-   */
-  refresh () {
-    if (this.$source && !isFunction(this.$source.clear)) {
-      return this::cmp.methods.refresh()
-    }
+  watch: {
+    id (value) {
+      if (!this.$source || value === getSourceId(this.$source)) {
+        return
+      }
 
-    return new Promise(resolve => {
-      let done = () => {
-        ++this.rev
-        resolve()
+      setSourceId(this.$source, value)
+    },
+    attributions (value) {
+      if (!this.$source || isEqual(value, this.$source.getAttributions())) {
+        return
       }
-      if (this.$source) {
-        this.$source.once('change', done)
-        this.$source.clear()
-      } else {
-        done()
+
+      this.$source.setAttributions(value)
+    },
+    attributionsCollapsible (value) {
+      if (!this.$source || value === this.$source.getAttributionsCollapsible()) {
+        return
       }
-    })
-  },
-}
 
-const watch = {
-  attributions (value) {
-    this.$source && this.$source.setAttributions(value)
-  },
-}
+      this.scheduleRecreate()
+    },
+    projection (value) {
+      if (
+        !this.$source ||
+        (this.$source.getProjection() && value === this.$source.getProjection().getCode())
+      ) {
+        return
+      }
 
-export default {
-  mixins: [cmp, useMapCmp],
-  props,
-  methods,
-  watch,
+      this.scheduleRecreate()
+    },
+    wrapX (value) {
+      if (!this.$source || value === this.$source.getWrapX()) {
+        return
+      }
+
+      this.scheduleRecreate()
+    },
+  },
   stubVNode: {
     empty () {
-      return this.$options.name
+      return this.vmId
     },
   },
   created () {
-    Object.defineProperties(this, {
-      /**
-       * @type {Source|undefined}
-       */
-      $source: {
-        enumerable: true,
-        get: () => this.$olObject,
-      },
-      $map: {
-        enumerable: true,
-        get: () => this.$services && this.$services.map,
-      },
-      $view: {
-        enumerable: true,
-        get: () => this.$services && this.$services.view,
-      },
-      $sourceContainer: {
-        enumerable: true,
-        get: () => this.$services && this.$services.sourceContainer,
-      },
-    })
+    this::defineServices()
   },
 }
+
+function defineServices () {
+  Object.defineProperties(this, {
+    /**
+     * @type {module:ol/source/Source~Source|undefined}
+     */
+    $source: {
+      enumerable: true,
+      get: () => this.$olObject,
+    },
+    $map: {
+      enumerable: true,
+      get: () => this.$services && this.$services.map,
+    },
+    $view: {
+      enumerable: true,
+      get: () => this.$services && this.$services.view,
+    },
+    $sourceContainer: {
+      enumerable: true,
+      get: () => this.$services && this.$services.sourceContainer,
+    },
+  })
+}
diff --git a/src/mixin/style.js b/src/mixin/style.js
index 8ef7c106..bcfbdb0b 100644
--- a/src/mixin/style.js
+++ b/src/mixin/style.js
@@ -1,100 +1,116 @@
 import { first as firstObs } from 'rxjs/operators'
-import mergeDescriptors from '../util/multi-merge-descriptors'
+import { getStyleId, initializeStyle, setStyleId } from '../ol-ext'
 import { observableFromOlEvent } from '../rx-ext'
+import mergeDescriptors from '../util/multi-merge-descriptors'
 import cmp from './ol-virt-cmp'
 import useMapCmp from './use-map-cmp'
 
 /**
  * Basic style mixin.
  */
-const methods = {
-  /**
-   * @return {OlStyle|Promise<OlStyle>}
-   * @protected
-   */
-  createOlObject () {
-    return this.createStyle()
-  },
-  /**
-   * @return {OlStyle|Promise<OlStyle>}
-   * @protected
-   * @abstract
-   */
-  createStyle () {
-    throw new Error('Not implemented method')
-  },
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
-    return this::cmp.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::cmp.methods.deinit()
-  },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    const vm = this
-
-    return mergeDescriptors(this::cmp.methods.getServices(), {
-      get style () { return vm.$style },
-    })
-  },
-  /**
-   * @return {Promise}
-   */
-  refresh () {
-    if (this.$olObject == null) return Promise.resolve()
+export default {
+  mixins: [cmp, useMapCmp],
+  methods: {
+    /**
+     * @return {OlStyle|Promise<OlStyle>}
+     * @protected
+     */
+    async createOlObject () {
+      const style = await this.createStyle()
 
-    return this.remount()
-      .then(() => {
-        if (!this.$map) {
-          return
-        }
+      initializeStyle(style)
 
-        this.$map.render()
+      return style
+    },
+    /**
+     * @return {OlStyle|Promise<OlStyle>}
+     * @protected
+     * @abstract
+     */
+    createStyle () {
+      throw new Error('Not implemented method')
+    },
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    init () {
+      return this::cmp.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::cmp.methods.deinit()
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      const vm = this
 
-        return observableFromOlEvent(this.$map, 'postcompose')
-          .pipe(firstObs())
-          .toPromise()
+      return mergeDescriptors(this::cmp.methods.getServices(), {
+        get style () { return vm.$style },
       })
-  },
-}
+    },
+    /**
+     * @return {Promise}
+     */
+    refresh () {
+      if (this.$olObject == null) return Promise.resolve()
 
-export default {
-  mixins: [cmp, useMapCmp],
-  methods,
+      return this.remount()
+        .then(() => {
+          if (!this.$map) {
+            return
+          }
+
+          this.$map.render()
+
+          return observableFromOlEvent(this.$map, 'postcompose')
+            .pipe(firstObs())
+            .toPromise()
+        })
+    },
+  },
   stubVNode: {
     empty () {
-      return this.$options.name
+      return this.vmId
     },
   },
   created () {
-    Object.defineProperties(this, {
-      $style: {
-        enumerable: true,
-        get: () => this.$olObject,
-      },
-      $map: {
-        enumerable: true,
-        get: () => this.$services && this.$services.map,
-      },
-      $view: {
-        enumerable: true,
-        get: () => this.$services && this.$services.view,
-      },
-      $stylesContainer: {
-        enumerable: true,
-        get: () => this.$services && this.$services.stylesContainer,
-      },
-    })
+    this::defineServices()
+  },
+  watch: {
+    id (value) {
+      if (!this.$style || value === getStyleId(this.$style)) {
+        return
+      }
+
+      setStyleId(this.$style, value)
+    },
   },
 }
+
+function defineServices () {
+  Object.defineProperties(this, {
+    $style: {
+      enumerable: true,
+      get: () => this.$olObject,
+    },
+    $map: {
+      enumerable: true,
+      get: () => this.$services && this.$services.map,
+    },
+    $view: {
+      enumerable: true,
+      get: () => this.$services && this.$services.view,
+    },
+    $stylesContainer: {
+      enumerable: true,
+      get: () => this.$services && this.$services.stylesContainer,
+    },
+  })
+}
diff --git a/src/mixin/styles-container.js b/src/mixin/styles-container.js
index 4eace83a..149c3299 100644
--- a/src/mixin/styles-container.js
+++ b/src/mixin/styles-container.js
@@ -1,11 +1,12 @@
 import Vue from 'vue'
+import { Style } from 'ol/style'
 import { warn } from '../util/log'
 import { isFunction, reduce } from '../util/minilo'
 
 export default {
   created () {
     /**
-     * @type {Style[]|StyleFunction|Vue|undefined}
+     * @type {module:ol/style/Style~Style[]|module:ol/style/Style~StyleFunction|Vue|undefined}
      * @private
      */
     this._styles = undefined
@@ -13,7 +14,7 @@ export default {
   methods: {
     /**
      * Default style factory
-     * @return {Style[]|StyleFunction|undefined}
+     * @return {module:ol/style/Style~Style[]|module:ol/style/Style~StyleFunction|undefined}
      * @protected
      */
     getDefaultStyles () {},
@@ -29,13 +30,13 @@ export default {
       }
     },
     /**
-     * @return {Style[]|StyleFunction|Vue|undefined}
+     * @return {module:ol/style/Style~Style[]|module:ol/style/Style~StyleFunction|Vue|undefined}
      */
     getStyles () {
       return this._styles
     },
     /**
-     * @param {Style|StyleFunction|Vue|undefined} style
+     * @param {module:ol/style/Style~Style|module:ol/style/Style~StyleFunction|Vue|undefined} style
      * @return {void}
      */
     addStyle (style) {
@@ -65,7 +66,7 @@ export default {
       this.setStyle(currentStyles)
     },
     /**
-     * @param {Array<{style: Style, condition: (function|boolean|undefined)}>|StyleFunction|Vue|undefined} styles
+     * @param {Array<{style: module:ol/style/Style~Style, condition: (function|boolean|undefined)}>|module:ol/style/Style~StyleFunction|Vue|undefined} styles
      * @return {void}
      */
     setStyle (styles) {
@@ -82,7 +83,7 @@ export default {
       }
     },
     /**
-     * @param {Style|StyleFunction|Vue|undefined} style
+     * @param {module:ol/style/Style~Style|module:ol/style/Style~StyleFunction|Vue|undefined} style
      * @return {void}
      */
     removeStyle (style) {
@@ -112,7 +113,7 @@ export default {
     },
     /**
      * Style function factory
-     * @returns {StyleFunction}
+     * @returns {module:ol/style/Style~StyleFunction}
      * @protected
      */
     createStyleFunc () {
@@ -149,7 +150,8 @@ export default {
         // not empty or null style
         if (
           styles === null ||
-          (Array.isArray(styles) && styles.length)
+          (Array.isArray(styles) && styles.length) ||
+          styles instanceof Style
         ) {
           return styles
         }
diff --git a/src/mixin/tile-source.js b/src/mixin/tile-source.js
index 1875da27..47ac93d6 100644
--- a/src/mixin/tile-source.js
+++ b/src/mixin/tile-source.js
@@ -1,167 +1,197 @@
 import { createTileUrlFunction } from 'ol-tilecache'
-import { observableFromOlEvent } from '../rx-ext'
 import {
   CACHE_SIZE,
+  createExtentFromProjection,
+  createXyzGrid,
   EPSG_3857,
   MAX_ZOOM,
   MIN_ZOOM,
   PIXEL_RATIO,
   REPROJ_ERR_THRESHOLD,
   TILE_SIZE,
-} from '../ol-ext/consts'
-import { createExtentFromProjection } from '../ol-ext/extent'
-import { createXyzGrid } from '../ol-ext/tile-grid'
-import { hasSource, hasView } from '../util/assert'
-import { isFunction, isString, pick, replaceTokens } from '../util/minilo'
+} from '../ol-ext'
+import { observableFromOlEvent } from '../rx-ext'
+import { hasSource } from '../util/assert'
+import { isEqual, isString, pick, replaceTokens } from '../util/minilo'
+import { makeWatchers } from '../util/vue-helpers'
 import source from './source'
 import withUrl from './with-url'
 
-const props = {
-  cacheSize: {
-    type: Number,
-    default: CACHE_SIZE,
-  },
-  crossOrigin: String,
-  maxZoom: {
-    type: Number,
-    default: MAX_ZOOM,
-  },
-  minZoom: {
-    type: Number,
-    default: MIN_ZOOM,
-  },
-  opaque: Boolean,
-  projection: {
-    type: String,
-    default: EPSG_3857,
-  },
-  reprojectionErrorThreshold: {
-    type: Number,
-    default: REPROJ_ERR_THRESHOLD,
-  },
-  tilePixelRatio: {
-    type: Number,
-    default: PIXEL_RATIO,
-  },
-  tileSize: {
-    type: Array,
-    default: () => [TILE_SIZE, TILE_SIZE],
-    validator: value => value.length === 2,
-  },
-  tileLoadFunction: Function,
-  url: {
-    type: [String, Function],
-    required: true,
+export default {
+  mixins: [source, withUrl],
+  props: {
+    cacheSize: {
+      type: Number,
+      default: CACHE_SIZE,
+    },
+    crossOrigin: String,
+    maxZoom: {
+      type: Number,
+      default: MAX_ZOOM,
+    },
+    minZoom: {
+      type: Number,
+      default: MIN_ZOOM,
+    },
+    opaque: Boolean,
+    projection: {
+      type: String,
+      default: EPSG_3857,
+    },
+    reprojectionErrorThreshold: {
+      type: Number,
+      default: REPROJ_ERR_THRESHOLD,
+    },
+    tilePixelRatio: {
+      type: Number,
+      default: PIXEL_RATIO,
+    },
+    tileSize: {
+      type: Array,
+      default: () => [TILE_SIZE, TILE_SIZE],
+      validator: value => value.length === 2,
+    },
+    /**
+     * @type {module:ol/Tile~LoadFunction}
+     */
+    tileLoadFunction: Function,
+    tileKey: String,
+    /**
+     * URL template or custom tile URL function.
+     * @type {string|module:ol/Tile~UrlFunction}
+     */
+    url: {
+      type: [String, Function],
+      required: true,
+    },
+    /**
+     * Duration of the opacity transition for rendering. To disable the opacity transition, pass `0`.
+     * @type {number}
+     */
+    transition: Number,
   },
-  /**
-   * Duration of the opacity transition for rendering. To disable the opacity transition, pass `0`.
-   * @type {number}
-   */
-  transition: Number,
-}
+  computed: {
+    /**
+     * @type {string|undefined}
+     */
+    urlTmpl () {
+      if (!isString(this.url)) {
+        return
+      }
 
-const computed = {
-  /**
-   * @type {string}
-   */
-  urlTmpl () {
-    if (!isString(this.url)) {
-      return ''
-    }
-    return replaceTokens(this.url, pick(this, this.urlTokens))
-  },
-}
+      return replaceTokens(this.url, pick(this, this.urlTokens))
+    },
+    /**
+     * @returns {function}
+     */
+    urlFunc () {
+      if (!this.url) {
+        return
+      }
 
-const methods = {
-  /**
-   * @return {TileGrid}
-   * @protected
-   */
-  createTileGrid () {
-    hasView(this)
+      let url
+      if (this.urlTmpl != null) {
+        const extent = createExtentFromProjection(this.projection)
+        url = createTileUrlFunction(this.urlTmpl, this._tileGrid, extent)
+      } else {
+        url = this.url
+      }
 
-    return createXyzGrid({
-      extent: createExtentFromProjection(this.$view.getProjection()),
-      maxZoom: this.maxZoom,
-      minZoom: this.minZoom,
-      tileSize: this.tileSize,
-    })
+      return url
+    },
   },
-  /**
-   * @return {TileUrlFunction}
-   * @protected
-   */
-  createUrlFunc () {
-    // custom url function provided
-    if (isFunction(this.url)) {
-      return this.url
-    }
-    hasView(this)
-    // or use url function from ol-tilecache
-    return createTileUrlFunction(
-      this.urlTmpl,
-      this._tileGrid,
-      createExtentFromProjection(this.$view.getProjection()),
-    )
-  },
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
+  methods: {
     /**
-     * @type {TileGrid}
+     * @return {Promise}
      * @protected
      */
-    this._tileGrid = this.createTileGrid()
+    init () {
+      /**
+       * @type {module:ol/Tile~UrlFunction}
+       * @protected
+       */
+      this._tileGrid = createXyzGrid({
+        extent: createExtentFromProjection(this.projection),
+        maxZoom: this.maxZoom,
+        minZoom: this.minZoom,
+        tileSize: this.tileSize,
+      })
 
-    return this::source.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    this._tileGrid = undefined
+      return this::source.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::source.methods.deinit()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      this::source.methods.mount()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this::source.methods.unmount()
+    },
+    subscribeAll () {
+      this::source.methods.subscribeAll()
+      this::subscribeToSourceEvents()
+    },
+  },
+  watch: {
+    opaque (value) {
+      if (!this.$source || value === this.$source.getOpaque()) {
+        return
+      }
 
-    return this::source.methods.deinit()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this::source.methods.mount()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this::source.methods.mount()
-  },
-  subscribeAll () {
-    this::subscribeToSourceEvents()
-  },
-}
+      this.scheduleRecreate()
+    },
+    tilePixelRatio (value) {
+      if (!this.$source || value === this.$source.getOpaque()) {
+        return
+      }
+
+      this.scheduleRecreate()
+    },
+    tileKey (value) {
+      if (!this.$source || value === this.$source.getKey()) {
+        return
+      }
+
+      this.$source.setKey(value)
+    },
+    tileLoadFunction (value, prevValue) {
+      if (!this.$source || isEqual(value, prevValue)) return
+
+      this.$source.setTileLoadFunction(value)
+    },
+    url () {
+      if (!this.$source) return
 
-const watch = {
-  url () {
-    if (this.$source) {
       this.$source.setTileUrlFunction(this.createUrlFunc())
       this.scheduleRefresh()
-    }
+    },
+    ...makeWatchers([
+      'cacheSize',
+      'crossOrigin',
+      'reprojectionErrorThreshold',
+      'transition',
+      'maxZoom',
+      'minZoom',
+      'tileSize',
+    ], () => function () {
+      this.scheduleRecreate()
+    }),
   },
 }
 
-export default {
-  mixins: [source, withUrl],
-  props,
-  computed,
-  methods,
-  watch,
-}
-
 function subscribeToSourceEvents () {
   hasSource(this)
 
@@ -171,5 +201,11 @@ function subscribeToSourceEvents () {
     'tileloaderror',
   ])
 
-  this.subscribeTo(events, evt => this.$emit(evt.type, evt))
+  this.subscribeTo(events, evt => {
+    ++this.rev
+
+    this.$nextTick(() => {
+      this.$emit(evt.type, evt)
+    })
+  })
 }
diff --git a/src/mixin/use-map-cmp.js b/src/mixin/use-map-cmp.js
index f6ceb133..160554ed 100644
--- a/src/mixin/use-map-cmp.js
+++ b/src/mixin/use-map-cmp.js
@@ -11,6 +11,7 @@ export default {
      * @protected
      */
     beforeInit () {
+      // waits while $map service will be injected
       return intervalObs(100).pipe(
         skipWhile(() => !this.$map),
         firstObs(),
diff --git a/src/mixin/vector-layer.js b/src/mixin/vector-layer.js
index 56e54a0f..ec62ad51 100644
--- a/src/mixin/vector-layer.js
+++ b/src/mixin/vector-layer.js
@@ -1,90 +1,152 @@
+import { isEqual } from '../util/minilo'
 import mergeDescriptors from '../util/multi-merge-descriptors'
 import layer from './layer'
 import stylesContainer from './styles-container'
 
-const props = {
-  /**
-   * When set to `true`, feature batches will be recreated during animations.
-   * @type {boolean}
-   * @default false
-   */
-  updateWhileAnimating: Boolean,
-  /**
-   * When set to `true`, feature batches will be recreated during interactions.
-   * @type {boolean}
-   * @default false
-   */
-  updateWhileInteracting: Boolean,
-  /**
-   * @type {number|undefined}
-   */
-  renderBuffer: {
-    type: Number,
-    default: 100,
-  },
-  /**
-   * @type {RenderOrderFunction|undefined}
-   */
-  renderOrder: Function,
-  /**
-   * @type {boolean}
-   */
-  declutter: Boolean,
-}
-
-const methods = {
-  /**
-   * @return {Promise<Vue<Layer>>}
-   * @protected
-   */
-  init () {
-    return this::layer.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::layer.methods.deinit()
-  },
-  /**
-   * @returns {Object}
-   * @protected
-   */
-  getServices () {
-    return mergeDescriptors(
-      this::layer.methods.getServices(),
-      this::stylesContainer.methods.getServices(),
-    )
-  },
-  /**
-   * @return {Vector|undefined}
-   * @protected
-   */
-  getStyleTarget () {
-    return this.$layer
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this::layer.methods.mount()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this::layer.methods.unmount()
+export default {
+  mixins: [layer, stylesContainer],
+  props: {
+    /**
+     * When set to `true`, feature batches will be recreated during animations.
+     * @type {boolean}
+     * @default false
+     */
+    updateWhileAnimating: Boolean,
+    /**
+     * When set to `true`, feature batches will be recreated during interactions.
+     * @type {boolean}
+     * @default false
+     */
+    updateWhileInteracting: Boolean,
+    /**
+     * @type {number|undefined}
+     */
+    renderBuffer: {
+      type: Number,
+      default: 100,
+    },
+    renderOrder: Function,
+    renderMode: {
+      type: String,
+      default: 'vector',
+      validator: value => ['vector', 'image'].includes(value),
+    },
+    /**
+     * @type {boolean}
+     */
+    declutter: Boolean,
   },
-  subscribeAll () {
-    this::layer.methods.subscribeAll()
+  methods: {
+    /**
+     * @return {Promise<Vue<Layer>>}
+     * @protected
+     */
+    init () {
+      return this::layer.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::layer.methods.deinit()
+    },
+    /**
+     * @returns {Object}
+     * @protected
+     */
+    getServices () {
+      return mergeDescriptors(
+        this::layer.methods.getServices(),
+        this::stylesContainer.methods.getServices(),
+      )
+    },
+    /**
+     * @return {Vector|undefined}
+     * @protected
+     */
+    getStyleTarget () {
+      return this.$layer
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    mount () {
+      return this::layer.methods.mount()
+    },
+    /**
+     * @return {Promise|void}
+     * @protected
+     */
+    unmount () {
+      return this::layer.methods.unmount()
+    },
+    /**
+     * Updates layer state
+     * @return {Promise}
+     */
+    refresh () {
+      return this::layer.methods.refresh()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise<void>}
+     * @protected
+     */
+    remount () {
+      return this::layer.methods.remount()
+    },
+    /**
+     * Internal usage only in components that doesn't support refreshing.
+     * @return {Promise<void>}
+     * @protected
+     */
+    recreate () {
+      return this::layer.methods.remount()
+    },
+    /**
+     * @protected
+     */
+    subscribeAll () {
+      this::layer.methods.subscribeAll()
+    },
   },
-}
+  watch: {
+    updateWhileAnimating (value) {
+      if (!this.$layer || value === this.$layer.getUpdateWhileAnimating()) {
+        return
+      }
 
-export default {
-  mixins: [layer, stylesContainer],
-  props,
-  methods,
+      this.scheduleRecreate()
+    },
+    updateWhileInteracting (value) {
+      if (!this.$layer || value === this.$layer.getUpdateWhileInteracting()) {
+        return
+      }
+
+      this.scheduleRecreate()
+    },
+    renderBuffer (value) {
+      if (!this.$layer || value === this.$layer.getRenderBuffer()) {
+        return
+      }
+
+      this.scheduleRecreate()
+    },
+    renderOrder (value) {
+      if (!this.$layer || isEqual(value, this.$layer.getRenderOrder())) {
+        return
+      }
+
+      this.$layer.setRenderOrder(value)
+    },
+    declutter (value) {
+      if (!this.$layer || value === this.$layer.getDeclutter()) {
+        return
+      }
+
+      this.$layer.setDeclutter(value)
+    },
+  },
 }
diff --git a/src/mixin/vector-source.js b/src/mixin/vector-source.js
index 88bbffe6..59bd630a 100644
--- a/src/mixin/vector-source.js
+++ b/src/mixin/vector-source.js
@@ -1,149 +1,108 @@
-import { merge as mergeObs } from 'rxjs/observable'
-import { debounceTime, tap } from 'rxjs/operators'
-import { SourceCollectionAdapter } from '../ol-ext/collection'
-import observableFromOlEvent from '../rx-ext/from-ol-event'
-import * as assert from '../util/assert'
+import debounce from 'debounce-promise'
 import mergeDescriptors from '../util/multi-merge-descriptors'
+import { makeWatchers } from '../util/vue-helpers'
 import featuresContainer from './features-container'
 import projTransforms from './proj-transforms'
 import source from './source'
 
-const props = {
-  useSpatialIndex: {
-    type: Boolean,
-    default: true,
-  },
-}
-
-const computed = {
-  featuresViewProj () {
-    if (this.rev && this.resolvedDataProjection && this.$source) {
-      return this.getFeatures().map(::this.writeFeatureInViewProj)
-    }
-    return []
-  },
-}
-
-const methods = {
-  /**
-   * @return {void}
-   */
-  clear () {
-    this::featuresContainer.methods.clearFeatures()
-  },
-  /**
-   * @return {SourceCollectionAdapter}
-   * @protected
-   */
-  getFeaturesTarget () {
-    if (this._featuresTarget == null && this.$source) {
-      this._featuresTarget = new SourceCollectionAdapter(this.$source)
-    }
-
-    return this._featuresTarget
-  },
-  /**
-   * @return {Object}
-   * @protected
-   */
-  getServices () {
-    return mergeDescriptors(
-      this::source.methods.getServices(),
-      this::featuresContainer.methods.getServices(),
-    )
-  },
-  /**
-   * @return {Promise}
-   * @protected
-   */
-  init () {
-    return this::source.methods.init()
-  },
-  /**
-   * @return {void|Promise<void>}
-   * @protected
-   */
-  deinit () {
-    return this::source.methods.deinit()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  mount () {
-    this::source.methods.mount()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  unmount () {
-    this.clear()
-    this::source.methods.unmount()
-  },
-  /**
-   * @return {void}
-   * @protected
-   */
-  subscribeAll () {
-    this::subscribeToSourceChanges()
+export default {
+  mixins: [source, featuresContainer, projTransforms],
+  props: {
+    useSpatialIndex: {
+      type: Boolean,
+      default: true,
+    },
   },
-  /**
-   * @param feature
-   * @return {ReadonlyArray<any>}
-   * @protected
-   */
-  writeFeatureInDataProj (feature) {
-    return this::projTransforms.methods.writeFeatureInDataProj(feature)
+  methods: {
+    /**
+     * @return {void}
+     */
+    clear () {
+      this::featuresContainer.methods.clearFeatures()
+    },
+    /**
+     * @return {Object}
+     * @protected
+     */
+    getServices () {
+      return mergeDescriptors(
+        this::source.methods.getServices(),
+        this::featuresContainer.methods.getServices(),
+      )
+    },
+    /**
+     * @return {Promise}
+     * @protected
+     */
+    init () {
+      return this::source.methods.init()
+    },
+    /**
+     * @return {void|Promise<void>}
+     * @protected
+     */
+    deinit () {
+      return this::source.methods.deinit()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    mount () {
+      return this::source.methods.mount()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    unmount () {
+      this.clear()
+      return this::source.methods.unmount()
+    },
+    /**
+     * @return {void}
+     * @protected
+     */
+    subscribeAll () {
+      this::source.methods.subscribeAll()
+    },
+    /**
+     * @param feature
+     * @return {ReadonlyArray<any>}
+     * @protected
+     */
+    writeFeatureInDataProj (feature) {
+      return this::projTransforms.methods.writeFeatureInDataProj(feature)
+    },
+    /**
+     * @param feature
+     * @return {ReadonlyArray<any>}
+     * @protected
+     */
+    writeGeometryInViewProj (feature) {
+      return this::projTransforms.methods.writeFeatureInViewProj(feature)
+    },
   },
-  /**
-   * @param feature
-   * @return {ReadonlyArray<any>}
-   * @protected
-   */
-  writeGeometryInViewProj (feature) {
-    return this::projTransforms.methods.writeFeatureInViewProj(feature)
+  watch: {
+    featuresDataProj: {
+      deep: true,
+      handler: debounce(function (features) {
+        this.$emit('update:features', features)
+      }, 1000 / 60),
+    },
+    ...makeWatchers([
+      'useSpatialIndex',
+    ], () => function () {
+      return this.scheduleRecreate()
+    }),
   },
-}
-
-export default {
-  mixins: [source, featuresContainer, projTransforms],
-  props,
-  computed,
-  methods,
   stubVNode: {
     empty: false,
     attrs () {
       return {
-        class: this.$options.name,
+        id: this.vmId,
+        class: this.cmpName,
       }
     },
   },
 }
-
-function subscribeToSourceChanges () {
-  assert.hasSource(this)
-
-  const add = observableFromOlEvent(this.$source, 'addfeature').pipe(
-    tap(({ feature }) => {
-      this.addFeature(feature)
-    }),
-  )
-  const remove = observableFromOlEvent(this.$source, 'removefeature').pipe(
-    tap(({ feature }) => {
-      this.removeFeature(feature)
-    }),
-  )
-  const changeFeature = observableFromOlEvent(this.$source, 'changefeature')
-
-  const events = mergeObs(add, remove, changeFeature)
-
-  this.subscribeTo(events, evt => {
-    ++this.rev
-    this.$emit(evt.type, evt)
-  })
-  // emit event to allow `sync` modifier
-  this.subscribeTo(events.pipe(debounceTime(100)), () => {
-    this.$emit('update:features', this.getFeatures().map(::this.writeFeatureInDataProj))
-  })
-}
diff --git a/src/mixin/with-fill-stroke-style.js b/src/mixin/with-fill-stroke-style.js
index 1be21a5a..c0c74a84 100644
--- a/src/mixin/with-fill-stroke-style.js
+++ b/src/mixin/with-fill-stroke-style.js
@@ -1,60 +1,55 @@
 import Vue from 'vue'
 
-const methods = {
-  /**
-   * @param {Fill|Vue|undefined} fill
-   * @return {void}
-   * @protected
-   */
-  setFill (fill) {
-    fill = fill instanceof Vue ? fill.$style : fill
+export default {
+  methods: {
+    /**
+     * @param {Fill|Vue|undefined} fill
+     * @return {void}
+     * @protected
+     */
+    setFill (fill) {
+      fill = fill instanceof Vue ? fill.$style : fill
 
-    if (fill !== this._fill) {
-      this._fill = fill
-    }
-    if (this.$style && fill !== this.$style.getFill()) {
-      this.$style.setFill(fill)
-      this.scheduleRefresh()
-    }
-  },
-  /**
-   * @param {Stroke|Vue|undefined} stroke
-   * @return {void}
-   * @protected
-   */
-  setStroke (stroke) {
-    stroke = stroke instanceof Vue ? stroke.$style : stroke
+      if (fill !== this._fill) {
+        /**
+         * @type {Fill|undefined}
+         * @private
+         */
+        this._fill = fill
+      }
+      if (this.$style && fill !== this.$style.getFill()) {
+        this.$style.setFill(fill)
+        this.scheduleRefresh()
+      }
+    },
+    /**
+     * @param {Stroke|Vue|undefined} stroke
+     * @return {void}
+     * @protected
+     */
+    setStroke (stroke) {
+      stroke = stroke instanceof Vue ? stroke.$style : stroke
 
-    if (stroke !== this._stroke) {
-      this._stroke = stroke
-    }
-    if (this.$style && stroke !== this.$style.getStroke()) {
-      this.$style.setStroke(stroke)
-      this.scheduleRefresh()
-    }
+      if (stroke !== this._stroke) {
+        /**
+         * @type {Stroke|undefined}
+         * @private
+         */
+        this._stroke = stroke
+      }
+      if (this.$style && stroke !== this.$style.getStroke()) {
+        this.$style.setStroke(stroke)
+        this.scheduleRefresh()
+      }
+    },
   },
-}
-
-export default {
-  methods,
   stubVNode: {
     empty: false,
     attrs () {
       return {
-        class: this.$options.name,
+        id: this.vmId,
+        class: this.cmpName,
       }
     },
   },
-  created () {
-    /**
-     * @type {Fill|undefined}
-     * @private
-     */
-    this._fill = undefined
-    /**
-     * @type {Stroke|undefined}
-     * @private
-     */
-    this._stroke = undefined
-  },
 }
diff --git a/src/mixin/wms-source.js b/src/mixin/wms-source.js
index c004b7e2..afc06c8a 100644
--- a/src/mixin/wms-source.js
+++ b/src/mixin/wms-source.js
@@ -1,6 +1,7 @@
 import { WMS_VERSION } from '../ol-ext'
 import { hasSource, hasView } from '../util/assert'
 import { reduce } from '../util/minilo'
+import { makeWatchers } from '../util/vue-helpers'
 
 const cleanExtParams = params => reduce(params, (params, value, key) => {
   const filterKeys = [
@@ -100,24 +101,18 @@ const methods = {
 }
 
 const watch = {
-  layers (LAYERS) {
-    this.$source && this.$source.updateParams({ LAYERS })
-  },
-  version (VERSION) {
-    this.$source && this.$source.updateParams({ VERSION })
-  },
-  styles (STYLES) {
-    this.$source && this.$source.updateParams({ STYLES })
-  },
-  transparent (TRANSPARENT) {
-    this.$source && this.$source.updateParams({ TRANSPARENT })
-  },
-  time (TIME) {
-    this.$source && this.$source.updateParams({ TIME })
-  },
-  bgColor (BGCOLOR) {
-    this.$source && this.$source.updateParams({ BGCOLOR })
-  },
+  ...makeWatchers([
+    'layers',
+    'version',
+    'styles',
+    'transparent',
+    'format',
+    'bgColor',
+    'time',
+  ], prop => function (value) {
+    prop = prop.toUpperCase()
+    this.$source && this.$source.updateParams({ [prop]: value })
+  }),
   extParams (value) {
     this.$source && this.$source.updateParams(value ? cleanExtParams(value) : undefined)
   },
diff --git a/src/mixin/xyz-source.js b/src/mixin/xyz-source.js
index ad077917..bfe30987 100644
--- a/src/mixin/xyz-source.js
+++ b/src/mixin/xyz-source.js
@@ -1,35 +1,31 @@
 import XYZSource from 'ol/source/XYZ'
 import tileSource from './tile-source'
 
-const methods = {
-  /**
-   * @return {XYZ}
-   * @protected
-   */
-  createSource () {
-    return new XYZSource({
-      attributions: this.attributions,
-      cacheSize: this.cacheSize,
-      crossOrigin: this.crossOrigin,
-      maxZoom: this.maxZoom,
-      minZoom: this.minZoom,
-      opaque: this.opaque,
-      projection: this.projection,
-      reprojectionErrorThreshold: this.reprojectionErrorThreshold,
-      tileGrid: this._tileGrid,
-      tilePixelRatio: this.tilePixelRatio,
-      tileUrlFunction: this.createUrlFunc(),
-      tileLoadFunction: this.tileLoadFunction,
-      wrapX: this.wrapX,
-      transition: this.transition,
-    })
-  },
-}
-
-const watch = {}
-
 export default {
   mixins: [tileSource],
-  methods,
-  watch,
+  methods: {
+    /**
+     * @return {XYZ}
+     * @protected
+     */
+    createSource () {
+      return new XYZSource({
+        attributions: this.attributions,
+        attributionsCollapsible: this.attributionsCollapsible,
+        cacheSize: this.cacheSize,
+        crossOrigin: this.crossOrigin,
+        maxZoom: this.maxZoom,
+        minZoom: this.minZoom,
+        opaque: this.opaque,
+        projection: this.projection,
+        reprojectionErrorThreshold: this.reprojectionErrorThreshold,
+        tileGrid: this._tileGrid,
+        tilePixelRatio: this.tilePixelRatio,
+        tileUrlFunction: this.urlFunc,
+        tileLoadFunction: this.tileLoadFunction,
+        wrapX: this.wrapX,
+        transition: this.transition,
+      })
+    },
+  },
 }
diff --git a/src/ol-ext/collection.js b/src/ol-ext/collection.js
deleted file mode 100644
index 4fd82817..00000000
--- a/src/ol-ext/collection.js
+++ /dev/null
@@ -1,239 +0,0 @@
-import { forEach } from '../util/minilo'
-
-/**
- * Wraps OpenLayers collection to provide indexed access to elements.
- */
-export class IndexedCollectionAdapter {
-  /**
-   * @param {Collection} collection
-   * @param {function} getElementKey
-   */
-  constructor (collection, getElementKey) {
-    /**
-     * @type {Collection}
-     * @private
-     */
-    this._adaptee = collection
-    /**
-     * @type {Function}
-     * @private
-     */
-    this._getElementKey = getElementKey
-    /**
-     * @type {Object<mixed, number>}
-     * @private
-     */
-    this._index = Object.create(null)
-
-    this._adaptee.forEach(element => this._addToIndex(this._getElementKey(element), element))
-  }
-
-  /**
-   * @return {Collection}
-   */
-  get adaptee () {
-    return this._adaptee
-  }
-
-  get elements () {
-    return this._adaptee.getArray()
-  }
-
-  /**
-   * @param {function} iteratee
-   */
-  forEach (iteratee) {
-    forEach(this.elements, iteratee)
-  }
-
-  /**
-   * @param {*} element
-   */
-  add (element) {
-    let key = this._getElementKey(element)
-
-    if (key != null) {
-      this._adaptee.push(element)
-      this._index[key] = element
-    }
-  }
-
-  /**
-   * @param {*} element
-   */
-  remove (element) {
-    if (this._adaptee.remove(element)) {
-      this._removeFromIndex(this._getElementKey(element))
-    }
-  }
-
-  /**
-   * @param {*} element
-   * @return {boolean}
-   */
-  has (element) {
-    return !!this.findByKey(this._getElementKey(element))
-  }
-
-  /**
-   * @return {void}
-   */
-  clear () {
-    this._adaptee.clear()
-    this._resetIndex()
-  }
-
-  /**
-   * @param {*} key
-   * @return {*|undefined}
-   */
-  findByKey (key) {
-    return key && this._index[key]
-  }
-
-  /**
-   * @param {function} sorter
-   */
-  sort (sorter) {
-    this.elements.sort(sorter)
-  }
-
-  /**
-   * @private
-   */
-  _resetIndex () {
-    this._index = Object.create(null)
-  }
-
-  /**
-   * @param {string} key
-   * @param {*} element
-   * @private
-   */
-  _addToIndex (key, element) {
-    if (key == null) {
-      return false
-    }
-
-    this._index[key] = element
-    element.on('propertychange', this._handleElementChange, this)
-
-    return true
-  }
-
-  /**
-   * @param {string} key
-   * @private
-   */
-  _removeFromIndex (key) {
-    let element = this.findByKey(key)
-
-    if (element) {
-      element.un('propertychange', this._handleElementChange, this)
-      delete this._index[key]
-    }
-
-    return !!element
-  }
-
-  /**
-   * Updates index
-   * @param {*} target
-   * @private
-   */
-  _handleElementChange ({ target }) {
-    let key = this._getElementKey(target)
-    // remove by old key
-    if (this.findByKey(key) !== target) {
-      for (let k in this._index) {
-        if (this._index[k] === target) {
-          this._removeFromIndex(k)
-          break
-        }
-      }
-    }
-
-    this._addToIndex(key, target)
-  }
-}
-
-/**
- * Wraps vector source to provide collection like API.
- */
-export class SourceCollectionAdapter {
-  /**
-   * @param {Vector} source
-   */
-  constructor (source) {
-    /**
-     * @type {Vector}
-     * @private
-     */
-    this._adaptee = source
-  }
-
-  /**
-   * @return {Vector}
-   */
-  get adaptee () {
-    return this._adaptee
-  }
-
-  /**
-   * @return {Array<Feature>}
-   */
-  get elements () {
-    return this._adaptee.getFeatures()
-  }
-
-  /**
-   * @param {function} iteratee
-   */
-  forEach (iteratee) {
-    this.elements.forEach(iteratee)
-  }
-
-  /**
-   * @param {Feature} feature
-   */
-  add (feature) {
-    this._adaptee.addFeature(feature)
-  }
-
-  /**
-   * @param {Feature} feature
-   */
-  remove (feature) {
-    this._adaptee.removeFeature(feature)
-  }
-
-  /**
-   * @param {Feature} feature
-   * @return {boolean}
-   */
-  has (feature) {
-    return !!this.findByKey(feature.getId())
-  }
-
-  /**
-   * @return {void}
-   */
-  clear () {
-    this._adaptee.clear()
-  }
-
-  /**
-   * @param {*} key
-   * @return {Feature|undefined}
-   */
-  findByKey (key) {
-    return this._adaptee.getFeatureById(key)
-  }
-
-  /**
-   * @param {function} sorter
-   */
-  sort (sorter) {
-    throw new Error('Not supported')
-  }
-}
diff --git a/src/ol-ext/consts.js b/src/ol-ext/consts.js
index b1c21b83..76f93984 100644
--- a/src/ol-ext/consts.js
+++ b/src/ol-ext/consts.js
@@ -94,3 +94,23 @@ export const WMTS_VERSION = '1.0.0'
 export const WMTS_REQUEST_ENCODING = 'KVP'
 export const WMTS_FORMAT = 'image/jpeg'
 export const LAYER_PROP = 'layer'
+
+export const ARCGIS_EXTRA_PARAMS = [
+  'FORMAT',
+  'F',
+  'LAYERS',
+  'LAYERDEFS',
+  'DYNAMICLAYERS',
+  'DPI',
+  'TRANSPARENT',
+  'TIME',
+  'LAYERTIMEOPTIONS',
+  'GDBVERSION',
+  'MAPSCALE',
+  'ROTATION',
+  'DATUMTRANSFORMATIONS',
+  'MAPRANGEVALUES',
+  'LAYERRANGEVALUES',
+  'LAYERPARAMETERVALUES',
+  'HISTORICMOMENT',
+]
diff --git a/src/ol-ext/feature.js b/src/ol-ext/feature.js
index a0033186..321b96a2 100644
--- a/src/ol-ext/feature.js
+++ b/src/ol-ext/feature.js
@@ -1,37 +1,66 @@
 import Feature from 'ol/Feature'
-/** @module ol-ext/feature */
 import uuid from 'uuid/v4'
 import Vue from 'vue'
 import { isNumber, isPlainObject, isString } from '../util/minilo'
 
 /**
- * Basic feature initialization
- * @param feature
+ * @param {Object|Vue|Feature|string|number} feature
+ * @return {string|number}
+ * @throws {Error}
  */
-export function initFeature (feature) {
-  if (feature.getId() == null) {
-    feature.setId(uuid())
+export function getFeatureId (feature) {
+  if (isPlainObject(feature) || feature instanceof Vue) {
+    return feature.id
+  } else if (feature instanceof Feature) {
+    return feature.getId()
+  } else if (isString(feature) || isNumber(feature)) {
+    return feature
   }
 
-  return feature
+  throw new Error('Illegal feature format')
 }
 
 /**
- * @param {Object|Vue|Feature|string|number} feature
- * @return {string|number}
- * @throws {Error}
+ * @param {Feature|Vue|Object} feature
+ * @param {string} featureId
+ * @returns {Feature|Vue|Object}
  */
-export function getFeatureId (feature) {
-  let id
+export function setFeatureId (feature, featureId) {
   if (isPlainObject(feature) || feature instanceof Vue) {
-    id = feature.id
+    feature.id = featureId
+
+    return feature
   } else if (feature instanceof Feature) {
-    id = feature.getId()
-  } else if (isString(feature) || isNumber(feature)) {
-    id = feature
-  } else {
-    throw new Error('Illegal feature format')
+    feature.setId(featureId)
+
+    return feature
+  }
+
+  throw new Error('Illegal feature format')
+}
+
+/**
+ * @param {Feature} feature
+ * @param {string|undefined} defaultFeatureId
+ * @returns {Feature}
+ */
+export function initializeFeature (feature, defaultFeatureId) {
+  if (getFeatureId(feature) == null) {
+    setFeatureId(feature, defaultFeatureId || uuid())
   }
 
-  return id
+  return feature
+}
+
+/**
+ * @param {Feature} destFeature
+ * @param {Feature} srcFeature
+ * @returns {Feature}
+ */
+export function mergeFeatures (destFeature, srcFeature) {
+  destFeature.setProperties({ ...srcFeature.getProperties() })
+  destFeature.setGeometry(srcFeature.getGeometry().clone())
+  destFeature.setStyle(srcFeature.getStyle() != null ? srcFeature.getStyle().clone() : undefined)
+
+  return destFeature
 }
diff --git a/src/ol-ext/format.js b/src/ol-ext/format.js
index d4f0327a..abddbfd0 100644
--- a/src/ol-ext/format.js
+++ b/src/ol-ext/format.js
@@ -6,6 +6,8 @@ import { EPSG_4326 } from './consts'
 import { createCircularPolygon } from './geom'
 import { transformPoint } from './proj'
 import { isCircle } from './util'
+import LineString from 'ol/geom/LineString'
+import { getLength } from 'ol/sphere'
 
 /**
  * @param {Object} [options]
@@ -34,13 +36,16 @@ export function createMvtFmt (options) {
 class GeoJSON extends BaseGeoJSON {
   writeGeometryObject (geometry, options) {
     if (isCircle(geometry)) {
+      const start = geometry.getCenter()
+      const end = [start[0] + geometry.getRadius(), start[1]]
+      const radius = getLength(new LineString([start, end]), options.featureProjection || this.defaultFeatureProjection)
       geometry = createCircularPolygon(
         transformPoint(
           geometry.getCenter(),
           options.featureProjection || this.defaultFeatureProjection,
           EPSG_4326,
         ),
-        geometry.getRadius(),
+        radius
       )
       options.featureProjection = EPSG_4326
     }
diff --git a/src/ol-ext/geojson.js b/src/ol-ext/geojson.js
index 2a595eda..15fe8da6 100644
--- a/src/ol-ext/geojson.js
+++ b/src/ol-ext/geojson.js
@@ -11,7 +11,7 @@ const geoJsonFmt = createGeoJsonFmt()
  * @return {Object}
  */
 export function writeGeoJsonFeature (feature, featureProjection, dataProjection) {
-  const geoJsonFeature = geoJsonFmt.writeFeatureObject(feature, { featureProjection, dataProjection: dataProjection })
+  const geoJsonFeature = geoJsonFmt.writeFeatureObject(feature, { featureProjection, dataProjection })
 
   if (Array.isArray(get(geoJsonFeature, 'properties.features'))) {
     geoJsonFeature.properties.features = geoJsonFeature.properties.features.map(feature => {
@@ -32,7 +32,7 @@ export function writeGeoJsonFeature (feature, featureProjection, dataProjection)
  * @return {Feature}
  */
 export function readGeoJsonFeature (geoJsonFeature, featureProjection, dataProjection) {
-  let feature = geoJsonFmt.readFeature(geoJsonFeature, { featureProjection, dataProjection: dataProjection })
+  let feature = geoJsonFmt.readFeature(geoJsonFeature, { featureProjection, dataProjection })
 
   if (Array.isArray(feature.get('features'))) {
     feature.set('features', feature.get('features').map(feature => {
diff --git a/src/ol-ext/geom.js b/src/ol-ext/geom.js
index 008d5703..076d206f 100644
--- a/src/ol-ext/geom.js
+++ b/src/ol-ext/geom.js
@@ -1,3 +1,6 @@
+import Vue from 'vue'
+import Geometry from 'ol/geom/Geometry'
+import uuid from 'uuid/v4'
 import pointOnFeature from '@turf/point-on-feature'
 import Circle from 'ol/geom/Circle'
 import GeometryCollection from 'ol/geom/GeometryCollection'
@@ -132,3 +135,35 @@ export function findPointOnSurface (geom) {
     return pointFeature.geometry.coordinates
   }
 }
+
+export function getGeometryId (geometry) {
+  if (geometry instanceof Vue) {
+    return geometry.id
+  } else if (geometry instanceof Geometry) {
+    return geometry.get('id')
+  }
+
+  throw new Error('Illegal geometry argument')
+}
+
+export function setGeometryId (geometry, geometryId) {
+  if (geometry instanceof Vue) {
+    geometry.id = geometryId
+
+    return geometry
+  } else if (geometry instanceof Geometry) {
+    geometry.set('id', geometryId)
+
+    return geometry
+  }
+
+  throw new Error('Illegal geometry argument')
+}
+
+export function initializeGeometry (geometry, defaultGeometryId) {
+  if (getGeometryId(geometry) == null) {
+    setGeometryId(geometry, defaultGeometryId || uuid())
+  }
+
+  return geometry
+}
diff --git a/src/ol-ext/index.js b/src/ol-ext/index.js
index 0706ac2d..eddd1734 100644
--- a/src/ol-ext/index.js
+++ b/src/ol-ext/index.js
@@ -1,15 +1,16 @@
-/**
- * @module ol-ext
- */
-export * from './collection'
 export * from './consts'
 export * from './extent'
 export * from './feature'
 export * from './format'
 export * from './geojson'
 export * from './geom'
+export * from './interaction'
+export * from './layer'
 export * from './load-strategy'
+export * from './map'
+export * from './overlay'
 export * from './proj'
+export * from './source'
 export * from './style'
 export * from './tile-grid'
 export * from './util'
diff --git a/src/ol-ext/interaction.js b/src/ol-ext/interaction.js
new file mode 100644
index 00000000..acd46e1c
--- /dev/null
+++ b/src/ol-ext/interaction.js
@@ -0,0 +1,71 @@
+import Interaction from 'ol/interaction/Interaction'
+import uuid from 'uuid/v4'
+import Vue from 'vue'
+
+/**
+ * @param {Interaction|Vue} interaction
+ * @returns {string|null}
+ */
+export function getInteractionId (interaction) {
+  if (interaction instanceof Vue) {
+    return interaction.id
+  } else if (interaction instanceof Interaction) {
+    return interaction.get('id')
+  }
+
+  throw new Error('Illegal interaction argument')
+}
+
+/**
+ * @param {Interaction|Vue} interaction
+ * @param {string} interactionId
+ * @returns {Vue|Interaction}
+ */
+export function setInteractionId (interaction, interactionId) {
+  if (interaction instanceof Vue) {
+    interaction.id = interactionId
+
+    return interaction
+  } else if (interaction instanceof Interaction) {
+    interaction.set('id', interactionId)
+
+    return interaction
+  }
+
+  throw new Error('Illegal interaction argument')
+}
+
+export function getInteractionPriority (interaction) {
+  if (interaction instanceof Vue) {
+    return interaction.priority
+  } else if (interaction instanceof Interaction) {
+    return interaction.get('priority')
+  }
+
+  throw new Error('Illegal interaction argument')
+}
+
+export function setInteractionPriority (interaction, priority) {
+  if (interaction instanceof Vue) {
+    interaction.id = priority
+
+    return interaction
+  } else if (interaction instanceof Interaction) {
+    interaction.set('priority', priority)
+
+    return interaction
+  }
+
+  throw new Error('Illegal interaction argument')
+}
+
+export function initializeInteraction (interaction, defaultInteractionId, defaultPriority) {
+  if (getInteractionId(interaction) == null) {
+    setInteractionId(interaction, defaultInteractionId || uuid())
+  }
+  if (getInteractionPriority(interaction) == null) {
+    setInteractionPriority(interaction, defaultPriority || 0)
+  }
+
+  return interaction
+}
diff --git a/src/ol-ext/layer.js b/src/ol-ext/layer.js
new file mode 100644
index 00000000..08b7bac3
--- /dev/null
+++ b/src/ol-ext/layer.js
@@ -0,0 +1,35 @@
+import BaseLayer from 'ol/layer/Base'
+import uuid from 'uuid/v4'
+import Vue from 'vue'
+
+export function getLayerId (layer) {
+  if (layer instanceof Vue) {
+    return layer.id
+  } else if (layer instanceof BaseLayer) {
+    return layer.get('id')
+  }
+
+  throw new Error('Illegal layer argument')
+}
+
+export function setLayerId (layer, layerId) {
+  if (layer instanceof Vue) {
+    layer.id = layerId
+
+    return layer
+  } else if (layer instanceof BaseLayer) {
+    layer.set('id', layerId)
+
+    return layer
+  }
+
+  throw new Error('Illegal layer argument')
+}
+
+export function initializeLayer (layer, defaultLayerId) {
+  if (getLayerId(layer) == null) {
+    setLayerId(layer, defaultLayerId || uuid())
+  }
+
+  return layer
+}
diff --git a/src/ol-ext/map.js b/src/ol-ext/map.js
new file mode 100644
index 00000000..f70d8f42
--- /dev/null
+++ b/src/ol-ext/map.js
@@ -0,0 +1,50 @@
+import PluggableMap from 'ol/PluggableMap'
+import Vue from 'vue'
+
+export function getMapId (map) {
+  if (map instanceof Vue) {
+    return map.id
+  } else if (map instanceof PluggableMap) {
+    return map.get('id')
+  }
+
+  throw new Error('Illegal map argument')
+}
+
+export function setMapId (map, mapId) {
+  if (map instanceof Vue) {
+    map.id = mapId
+
+    return map
+  } else if (map instanceof PluggableMap) {
+    map.set('id', mapId)
+
+    return map
+  }
+
+  throw new Error('Illegal map argument')
+}
+
+export function getMapDataProjection (map) {
+  if (map instanceof Vue) {
+    return map.dataProjection
+  } else if (map instanceof PluggableMap) {
+    return map.get('dataProjection')
+  }
+
+  throw new Error('Illegal map argument')
+}
+
+export function setMapDataProjection (map, dataProjection) {
+  if (map instanceof Vue) {
+    map.dataProjection = dataProjection
+
+    return map
+  } else if (map instanceof PluggableMap) {
+    map.set('dataProjection', dataProjection)
+
+    return map
+  }
+
+  throw new Error('Illegal map argument')
+}
diff --git a/src/ol-ext/overlay.js b/src/ol-ext/overlay.js
new file mode 100644
index 00000000..1a8200cb
--- /dev/null
+++ b/src/ol-ext/overlay.js
@@ -0,0 +1,35 @@
+import Overlay from 'ol/Overlay'
+import uuid from 'uuid/v4'
+import Vue from 'vue'
+
+export function getOverlayId (overlay) {
+  if (overlay instanceof Vue) {
+    return overlay.id
+  } else if (overlay instanceof Overlay) {
+    return overlay.get('id')
+  }
+
+  throw new Error('Illegal overlay argument')
+}
+
+export function setOverlayId (overlay, overlayId) {
+  if (overlay instanceof Vue && overlay) {
+    overlay.id = overlayId
+
+    return overlay
+  } else if (overlay instanceof Overlay) {
+    overlay.set('id', overlayId)
+
+    return overlay
+  }
+
+  throw new Error('Illegal overlay argument')
+}
+
+export function initializeOverlay (overlay, defaultOverlay) {
+  if (getOverlayId(overlay) == null) {
+    setOverlayId(overlay, defaultOverlay || uuid())
+  }
+
+  return overlay
+}
diff --git a/src/ol-ext/source.js b/src/ol-ext/source.js
new file mode 100644
index 00000000..88453959
--- /dev/null
+++ b/src/ol-ext/source.js
@@ -0,0 +1,35 @@
+import Source from 'ol/source/Source'
+import uuid from 'uuid/v4'
+import Vue from 'vue'
+
+export function getSourceId (source) {
+  if (source instanceof Vue) {
+    return source.id
+  } else if (source instanceof Source) {
+    return source.get('id')
+  }
+
+  throw new Error('Illegal source argument')
+}
+
+export function setSourceId (source, sourceId) {
+  if (source instanceof Vue) {
+    source.id = sourceId
+
+    return source
+  } else if (source instanceof Source) {
+    source.set('id', sourceId)
+
+    return source
+  }
+
+  throw new Error('Illegal source argument')
+}
+
+export function initializeSource (source, defaultSourceId) {
+  if (getSourceId(source) == null) {
+    setSourceId(source, defaultSourceId || uuid())
+  }
+
+  return source
+}
diff --git a/src/ol-ext/style.js b/src/ol-ext/style.js
index 0a699c7e..455f2cf3 100644
--- a/src/ol-ext/style.js
+++ b/src/ol-ext/style.js
@@ -1,6 +1,3 @@
-/**
- * Style helpers
- */
 import Circle from 'ol/style/Circle'
 import Fill from 'ol/style/Fill'
 import Icon from 'ol/style/Icon'
@@ -10,10 +7,54 @@ import Stroke from 'ol/style/Stroke'
 import Style from 'ol/style/Style'
 import Text from 'ol/style/Text'
 import parseColor from 'parse-color'
+import uuid from 'uuid/v4'
+import Vue from 'vue'
 import { isFunction, isNumeric, lowerFirst, pick, reduce, upperFirst } from '../util/minilo'
 import { GEOMETRY_TYPE } from './consts'
 import * as geomHelper from './geom'
 
+export function getStyleId (style) {
+  if (
+    style instanceof Vue ||
+    style instanceof Style ||
+    style instanceof ImageStyle ||
+    style instanceof Text ||
+    style instanceof Stroke ||
+    style instanceof Fill ||
+    style instanceof Function
+  ) {
+    return style.id
+  }
+
+  throw new Error('Illegal style argument')
+}
+
+export function setStyleId (style, styleId) {
+  if (
+    style instanceof Vue ||
+    style instanceof Style ||
+    style instanceof ImageStyle ||
+    style instanceof Text ||
+    style instanceof Stroke ||
+    style instanceof Fill ||
+    style instanceof Function
+  ) {
+    style.id = styleId
+
+    return style
+  }
+
+  throw new Error('Illegal style argument')
+}
+
+export function initializeStyle (style, defaultStyleId) {
+  if (getStyleId(style) == null) {
+    setStyleId(style, defaultStyleId || uuid())
+  }
+
+  return style
+}
+
 /**
  * @return {VlStyle[]}
  */
@@ -47,21 +88,16 @@ export function defaultEditStyle () {
       strokeWidth: width,
     },
   ]
-  styles[GEOMETRY_TYPE.MULTI_LINE_STRING] =
-    styles[GEOMETRY_TYPE.LINE_STRING]
+  styles[GEOMETRY_TYPE.MULTI_LINE_STRING] = styles[GEOMETRY_TYPE.LINE_STRING]
 
   styles[GEOMETRY_TYPE.POLYGON] = [
     {
       fillColor: [255, 255, 255, 0.5],
     },
   ].concat(styles[GEOMETRY_TYPE.LINE_STRING])
-  styles[GEOMETRY_TYPE.MULTI_POLYGON] =
-    styles[GEOMETRY_TYPE.POLYGON]
+  styles[GEOMETRY_TYPE.MULTI_POLYGON] = styles[GEOMETRY_TYPE.POLYGON]
 
-  styles[GEOMETRY_TYPE.CIRCLE] =
-    styles[GEOMETRY_TYPE.POLYGON].concat(
-      styles[GEOMETRY_TYPE.LINE_STRING],
-    )
+  styles[GEOMETRY_TYPE.CIRCLE] = styles[GEOMETRY_TYPE.POLYGON].concat(styles[GEOMETRY_TYPE.LINE_STRING])
 
   styles[GEOMETRY_TYPE.POINT] = [
     {
@@ -72,14 +108,12 @@ export function defaultEditStyle () {
       zIndex: Infinity,
     },
   ]
-  styles[GEOMETRY_TYPE.MULTI_POINT] =
-    styles[GEOMETRY_TYPE.POINT]
+  styles[GEOMETRY_TYPE.MULTI_POINT] = styles[GEOMETRY_TYPE.POINT]
 
-  styles[GEOMETRY_TYPE.GEOMETRY_COLLECTION] =
-    styles[GEOMETRY_TYPE.POLYGON].concat(
-      styles[GEOMETRY_TYPE.LINE_STRING],
-      styles[GEOMETRY_TYPE.POINT],
-    )
+  styles[GEOMETRY_TYPE.GEOMETRY_COLLECTION] = styles[GEOMETRY_TYPE.POLYGON].concat(
+    styles[GEOMETRY_TYPE.LINE_STRING],
+    styles[GEOMETRY_TYPE.POINT],
+  )
 
   return styles
 }
@@ -88,8 +122,7 @@ const isEmpty = x => {
   if (x == null) return true
   if (typeof x === 'number') return false
 
-  return ((typeof x === 'string' || Array.isArray(x)) && !x.length) ||
-    !Object.keys(x).length
+  return ((typeof x === 'string' || Array.isArray(x)) && !x.length) || !Object.keys(x).length
 }
 
 /**
@@ -106,6 +139,7 @@ export function createStyle (vlStyle) {
     image: createImageStyle(vlStyle),
     geometry: createGeomStyle(vlStyle),
     zIndex: vlStyle.zIndex,
+    renderer: vlStyle.renderer,
   }
 
   if (!isEmpty(olStyle)) {
@@ -166,7 +200,15 @@ export function createFillStyle (vlStyle, prefix = '') {
  */
 export function createStrokeStyle (vlStyle, prefix = '') {
   const prefixKey = addPrefix(prefix)
-  const keys = ['strokeColor', 'strokeWidth', 'strokeDash', 'strokeCap', 'strokeJoin'].map(prefixKey)
+  const keys = [
+    'strokeColor',
+    'strokeWidth',
+    'strokeMiterLimit',
+    'strokeCap',
+    'strokeJoin',
+    'strokeDash',
+    'strokeDashOffset',
+  ].map(prefixKey)
   const compiledKey = prefixKey('stroke')
 
   if (vlStyle[compiledKey] instanceof Stroke) return vlStyle[compiledKey]
@@ -178,11 +220,13 @@ export function createStrokeStyle (vlStyle, prefix = '') {
     switch (name) {
       case prefixKey('strokeColor'):
       case prefixKey('strokeWidth'):
+      case prefixKey('strokeMiterLimit'):
         name = lowerFirst(name.replace(new RegExp(prefixKey('stroke')), ''))
         break
-      case prefixKey('strokeDash'):
       case prefixKey('strokeCap'):
       case prefixKey('strokeJoin'):
+      case prefixKey('strokeDash'):
+      case prefixKey('strokeDashOffset'):
         name = 'line' + name.replace(new RegExp(prefixKey('stroke')), '')
         break
     }
@@ -339,12 +383,15 @@ export function createGeomStyle (vlStyle) {
  * @property {string|number[]|undefined} fillColor
  * @property {string|number[]|undefined} strokeColor
  * @property {number|undefined} strokeWidth
+ * @property {number|undefined} strokeMiterLimit
  * @property {number[]|undefined} strokeDash
+ * @property {number[]|undefined} strokeDashOffset
  * @property {string|undefined} strokeCap
  * @property {string|undefined} strokeJoin
  * @property {number|undefined} zIndex
  * @property {Fill|undefined} fill
  * @property {Stroke|undefined} stroke
+ * @property {RenderFunction|undefined} renderer
  *
  * Text only
  * @property {string|Text|undefined} text
diff --git a/src/ol-ext/util.js b/src/ol-ext/util.js
index 4ce36e38..5787a4f7 100644
--- a/src/ol-ext/util.js
+++ b/src/ol-ext/util.js
@@ -1,5 +1,9 @@
-/** @module ol-ext/util */
-import { isFunction } from '../util/minilo'
+import { getUid } from 'ol'
+import { isFunction, reduce } from '../util/minilo'
+
+export function getObjectUid (object) {
+  return getUid(object)
+}
 
 /**
  * heuristic check that value is ol collection
@@ -26,3 +30,16 @@ export function isVectorSource (value) {
 export function isCircle (value) {
   return isFunction(value.getCenter) && isFunction(value.getRadius)
 }
+
+export function cleanSourceExtraParams (params, filterKeys) {
+  return reduce(params, (params, value, key) => {
+    key = key.toUpperCase()
+    if (filterKeys.includes(key)) {
+      return params
+    }
+
+    params[key] = value
+
+    return params
+  }, {})
+}
diff --git a/src/rx-ext/from-ol-change-event.js b/src/rx-ext/from-ol-change-event.js
index 57b1f02f..07104e6c 100644
--- a/src/rx-ext/from-ol-change-event.js
+++ b/src/rx-ext/from-ol-change-event.js
@@ -1,18 +1,18 @@
 import { merge as mergeObs } from 'rxjs/observable'
-import { distinctUntilChanged, map as mapObs, throttleTime } from 'rxjs/operators'
+import { distinctUntilChanged, map as mapObs, debounceTime } from 'rxjs/operators'
 import { isEqual, isFunction } from '../util/minilo'
 import fromOlEvent from './from-ol-event'
 
 /**
  * Creates Observable from OpenLayers change:* event
- * @param {ol.Object} target
+ * @param {module:ol/Observable~Observable} target
  * @param {string|string[]} [prop]
  * @param {boolean|function(a, b):boolean|undefined} [distinct] Distinct values by isEqual fn or by custom comparator
- * @param {number|undefined} [throttle] Throttle values by passed amount of ms.
- * @param {function(target: ol.Object, prop: string):*|undefined} [selector] Custom selector
+ * @param {number|undefined} [debounce] Debounce values by passed amount of ms.
+ * @param {function|undefined} [selector] Custom selector
  * @return {Observable<{prop: string, value: *}>}
  */
-export default function fromOlChangeEvent (target, prop, distinct, throttle, selector) {
+export default function fromOlChangeEvent (target, prop, distinct, debounce, selector) {
   if (Array.isArray(prop)) {
     return mergeObs(...prop.map(p => fromOlChangeEvent(target, p)))
   }
@@ -22,8 +22,8 @@ export default function fromOlChangeEvent (target, prop, distinct, throttle, sel
   let observable = fromOlEvent(target, event, () => selector(target, prop))
   let operations = []
 
-  if (throttle != null) {
-    operations.push(throttleTime(throttle))
+  if (debounce != null) {
+    operations.push(debounceTime(debounce))
   }
   if (distinct) {
     isFunction(distinct) || (distinct = isEqual)
diff --git a/src/rx-ext/from-ol-event.js b/src/rx-ext/from-ol-event.js
index d8bab2d5..87917f1b 100644
--- a/src/rx-ext/from-ol-event.js
+++ b/src/rx-ext/from-ol-event.js
@@ -9,7 +9,7 @@ import { fromEventPattern, merge as mergeObs } from 'rxjs/observable'
  *
  * changes.subscribe(({ coordinate }) => console.log(coordinate))
  *
- * @param {ol.Object} target OpenLayers event target.
+ * @param {module:ol/Observable~Observable} target OpenLayers event target.
  * @param {string|Object[]} eventName The event name of interest, being emitted by the `target`
  *                          or an array of events/selectors like `[{ event: 'event1', selector?: x => x }, ...]`.
  * @param {function(...*): *} [selector] An optional function to post-process results. It takes the arguments
diff --git a/src/rx-ext/index.js b/src/rx-ext/index.js
index 6858c930..e2405350 100644
--- a/src/rx-ext/index.js
+++ b/src/rx-ext/index.js
@@ -1,5 +1,2 @@
-/**
- * @module rx-ext
- */
 export observableFromOlChangeEvent from './from-ol-change-event'
 export observableFromOlEvent from './from-ol-event'
diff --git a/src/sass/_map.sass b/src/sass/_map.sass
deleted file mode 100644
index 20a0bd69..00000000
--- a/src/sass/_map.sass
+++ /dev/null
@@ -1,4 +0,0 @@
-@import mixins
-
-.vl-map
-  +vl-wh(100%, 100%)
diff --git a/src/sass/_mixins.sass b/src/sass/_mixins.sass
deleted file mode 100644
index bdf13c94..00000000
--- a/src/sass/_mixins.sass
+++ /dev/null
@@ -1,6 +0,0 @@
-=vl-wh($w: auto, $h: auto)
-  width: $w
-  height: $h
-
-=vl-hidden()
-  display: none !important
diff --git a/src/sass/_overlay.sass b/src/sass/_overlay.sass
deleted file mode 100644
index 330156db..00000000
--- a/src/sass/_overlay.sass
+++ /dev/null
@@ -1,5 +0,0 @@
-.vl-overlay
-  position: relative
-  visibility: hidden
-  &.visible
-    visibility: visible
diff --git a/src/sass/_utils.sass b/src/sass/_utils.sass
deleted file mode 100644
index 0e4c55bd..00000000
--- a/src/sass/_utils.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-@import variables
-@import mixins
diff --git a/src/sass/main.sass b/src/sass/main.sass
deleted file mode 100644
index d4e535ea..00000000
--- a/src/sass/main.sass
+++ /dev/null
@@ -1,6 +0,0 @@
-/* include OpenLayers styles */
-@import ol/ol
-/* VueLayers base styles */
-@import utils
-@import map
-@import overlay
diff --git a/src/styles/component/_all.scss b/src/styles/component/_all.scss
new file mode 100644
index 00000000..65f7ff5b
--- /dev/null
+++ b/src/styles/component/_all.scss
@@ -0,0 +1,2 @@
+@import "map";
+@import "overlay";
diff --git a/src/styles/component/_map.scss b/src/styles/component/_map.scss
new file mode 100644
index 00000000..4df17369
--- /dev/null
+++ b/src/styles/component/_map.scss
@@ -0,0 +1,5 @@
+@import "../utils/mixins";
+
+.vl-map {
+  @include vl-wh(100%, 100%);
+}
diff --git a/src/styles/component/_overlay.scss b/src/styles/component/_overlay.scss
new file mode 100644
index 00000000..96a333ac
--- /dev/null
+++ b/src/styles/component/_overlay.scss
@@ -0,0 +1,8 @@
+.vl-overlay {
+  position: relative;
+  visibility: hidden;
+
+  &.visible {
+    visibility: visible;
+  }
+}
diff --git a/src/styles/main.scss b/src/styles/main.scss
new file mode 100644
index 00000000..a1db32df
--- /dev/null
+++ b/src/styles/main.scss
@@ -0,0 +1,5 @@
+/* include OpenLayers styles */
+@import "ol/ol";
+/* VueLayers base styles */
+@import "utils/all";
+@import "component/all";
diff --git a/src/styles/utils/_all.scss b/src/styles/utils/_all.scss
new file mode 100644
index 00000000..8cc02d61
--- /dev/null
+++ b/src/styles/utils/_all.scss
@@ -0,0 +1,2 @@
+@import "variables";
+@import "mixins";
diff --git a/src/styles/utils/_mixins.scss b/src/styles/utils/_mixins.scss
new file mode 100644
index 00000000..31faa163
--- /dev/null
+++ b/src/styles/utils/_mixins.scss
@@ -0,0 +1,8 @@
+@mixin vl-wh($w: auto, $h: auto) {
+  width: $w;
+  height: $h;
+}
+
+@mixin vl-hidden() {
+  display: none !important;
+}
diff --git a/src/sass/_variables.scss b/src/styles/utils/_variables.scss
similarity index 100%
rename from src/sass/_variables.scss
rename to src/styles/utils/_variables.scss
diff --git a/src/util/assert.js b/src/util/assert.js
index af5e8839..5d4816b2 100644
--- a/src/util/assert.js
+++ b/src/util/assert.js
@@ -107,6 +107,10 @@ export function hasSource (vm) {
   assert(vm.$source, 'component has "$source" property')
 }
 
+export function hasInnerSource (vm) {
+  assert(vm.$innerSource, 'component has "$innerSource" property')
+}
+
 /**
  * @param {Object} vm
  * @return {void}
diff --git a/src/util/identity-map.js b/src/util/identity-map.js
index d4df9248..1e829037 100644
--- a/src/util/identity-map.js
+++ b/src/util/identity-map.js
@@ -14,7 +14,7 @@ export default class IdentityMap {
 
   /**
    * @param {string} id
-   * @param {mixed} value
+   * @param {*} value
    * @param {string} pool
    */
   set (id, value, pool = 'default') {
diff --git a/src/util/minilo.js b/src/util/minilo.js
index e52220d6..175ec92c 100644
--- a/src/util/minilo.js
+++ b/src/util/minilo.js
@@ -1,6 +1,5 @@
 /**
  * Mini Lodash.
- * @module util/minilo
  */
 const glob = typeof global !== 'undefined' ? global : typeof window !== 'undefined' ? window : {}
 const globIsFinite = glob.isFinite || noop
@@ -315,3 +314,7 @@ export function camelCase (str) {
 
   return str.replace(regExp, matches => matches[1].toUpperCase())
 }
+
+export function arrayLengthValidator (len) {
+  return len => value => isArray(value) && value.length === len
+}
diff --git a/test/app.vue b/test/app.vue
index 64304ed8..6d78a76b 100644
--- a/test/app.vue
+++ b/test/app.vue
@@ -2,107 +2,92 @@
   <div id="app">
     <div style="height: 100%">
       <div class="panel">
-        <button @click="selectByHover = !selectByHover">Select by {{ !selectByHover ? 'hover' : 'click' }}</button>
-        <button @click="graticule = !graticule">Graticule</button>
-        <button @click="drawType = 'Polygon'">Draw polygon</button>
-        <button @click="drawType = undefined">Stop draw</button>
         <div>
-          {{ selectedFeatures }}
+          Selected:<br>
+          {{ selectedFeatureIds }}
         </div>
       </div>
 
-      <vl-map ref="map" v-if="showMap" data-projection="EPSG:4326">
-        <vl-view :center.sync="center" :rotation.sync="rotation" :zoom.sync="zoom" ident="view" ref="view" />
-
-        <vl-graticule :show-labels="true" v-if="graticule">
-          <vl-style-stroke :line-dash="[5, 10]" color="green" slot="stroke"></vl-style-stroke>
-          <vl-style-text slot="lon" text-baseline="bottom">
-            <vl-style-stroke color="blue" />
-          </vl-style-text>
-          <vl-style-text slot="lat" text-align="end">
-            <vl-style-stroke color="black" />
-          </vl-style-text>
-        </vl-graticule>
-
-        <vl-interaction-select :condition="selectCondition" :features.sync="selectedFeatures">
-          <template slot-scope="select">
-            <vl-overlay class="feature-popup" v-for="feature in select.features" :key="feature.id" :id="feature.id"
-                        :position="pointOnSurface(feature.geometry)" :auto-pan="true"
-                        :auto-pan-animation="{ duration: 300 }"
-                        positioning="bottom-right">
-              <div style="background: #fff; padding: 10px; width: 200px">
-                {{ feature }}
-              </div>
-            </vl-overlay>
-          </template>
-        </vl-interaction-select>
+      <vl-map ref="map" data-projection="EPSG:4326" :default-controls="controls" :default-interactions="interactions">
+        <vl-view :center.sync="center" :rotation.sync="rotation"
+                 :zoom.sync="zoom" :extent="[0, 0, 100, 50]"
+                 ident="view" ref="view" />
 
         <vl-layer-tile>
-          <vl-source-osm />
+          <vl-source-sputnik />
         </vl-layer-tile>
 
-        <vl-feature id="marker">
-          <vl-geom-point :coordinates="[0, 0]" />
-        </vl-feature>
-
-        <vl-layer-vector id="features">
-          <vl-source-vector :features.sync="features" />
+        <vl-layer-vector id="countries" render-mode="image">
+          <vl-source-vector ident="countries-source" :features.sync="countries" :url="countriesUrl" />
+          <vl-style-func :factory="createCountriesStyleFunc" />
         </vl-layer-vector>
 
-        <vl-layer-vector id="draw-pane" v-if="drawType != null">
-          <vl-source-vector :features.sync="drawnFeatures" ident="draw-target" />
+        <vl-layer-vector id="draw-target">
+          <vl-source-vector ident="draw-target" :features.sync="drawFeatures" />
         </vl-layer-vector>
 
-        <vl-interaction-draw :type="drawType" source="draw-target" v-if="drawType != null" />
+        <vl-interaction-select :features.sync="selectedFeatures" />
+        <vl-interaction-modify source="draw-target" />
       </vl-map>
     </div>
   </div>
 </template>
 
 <script>
-  import * as eventCondition from 'ol/events/condition'
-  import { findPointOnSurface } from '../src/ol-ext'
-
-  const features = [
-    {
-      type: 'Feature',
-      id: 'feature-1',
-      properties: {},
-      geometry: {
-        type: 'Point',
-        coordinates: [10, 10],
-      },
-    },
-  ]
-
-  const computed = {
-    selectCondition () {
-      return this.selectByHover ? eventCondition.pointerMove : eventCondition.singleClick
-    },
-  }
-
-  const methods = {
-    pointOnSurface: findPointOnSurface,
-  }
+  import { findPointOnSurface, createStyle } from '../src/ol-ext'
 
   export default {
     name: 'app',
-    computed,
-    methods,
     data () {
       return {
         zoom: 2,
-        center: [0, 0],
+        resolution: 39135.75848201024,
+        center: [100, 10],
         rotation: 0,
-        features,
+        countriesUrl: 'https://openlayers.org/en/latest/examples/data/geojson/countries.geojson',
+        countries: [],
+        featureId: undefined,
+        features: [],
         selectedFeatures: [],
-        graticule: false,
-        showMap: true,
-        drawType: undefined,
-        drawnFeatures: [],
-        selectByHover: false,
+        drawFeatures: [
+          {
+            type: 'Feature',
+            id: '213456789',
+            properties: {},
+            geometry: {
+              type: 'Polygon',
+              coordinates: [[
+                [0, 0],
+                [20, 0],
+                [20, 20],
+                [0, 20],
+                [0, 0],
+              ]],
+            },
+          },
+        ],
+        controls: true,
+        interactions: true,
       }
     },
+    computed: {
+      selectedFeatureIds () {
+        return this.selectedFeatures.map(({ id }) => id)
+      },
+    },
+    methods: {
+      pointOnSurface: findPointOnSurface,
+      createCountriesStyleFunc () {
+        return () => {
+          return createStyle({
+            fillColor: 'rgba(0, 0, 0, 0.4)',
+            strokeColor: 'blue',
+          })
+        }
+      },
+    },
+    mounted () {
+    },
   }
 </script>
 
@@ -140,4 +125,8 @@
       text-transform: uppercase;
     }
   }
+
+  .smooth-transition {
+    transition: all 0.3s ease-in-out;
+  }
 </style>
diff --git a/test/main.js b/test/main.js
index d6b95b45..f92e3f07 100644
--- a/test/main.js
+++ b/test/main.js
@@ -3,6 +3,9 @@ import Vue from 'vue'
 import VueLayers from '@'
 import App from './app.vue'
 
+Vue.performance = true
+Vue.productionTip = true
+
 Vue.use(VueLayers, {
   // dataProjection: 'EPSG:4326',
 })
diff --git a/test/umd.html b/test/umd.html
index 17f7c9e7..4d0208a0 100644
--- a/test/umd.html
+++ b/test/umd.html
@@ -17,28 +17,123 @@
     body * {
       box-sizing: border-box;
     }
+
+    #app {
+      display: flex;
+      flex-direction: column;
+    }
+
+    #map {
+      flex: 1 1 auto;
+    }
   </style>
   <link rel="stylesheet" href="../lib/style.css">
 </head>
 <body>
-<div id="app">
-  <vl-map>
-    <vl-view :center="[0, 0]" :zoom="2"></vl-view>
-
-    <vl-layer-tile>
-      <vl-source-osm></vl-source-osm>
-    </vl-layer-tile>
-  </vl-map>
-</div>
-
-<script src="https://unpkg.com/vue@2.5.17/dist/vue.min.js"></script>
-<script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io/en/v5.3.0/build/ol.js"></script>
-<script src="../lib/index.umd.js"></script>
-<script>
-  /* eslint-disable no-new */
-  new Vue({
-    el: '#app',
-  })
-</script>
+
+  <div id="app">
+    <div id="map">
+      <vl-map :load-tiles-while-animating="true"
+              :load-tiles-while-interacting="true"
+              data-projection="EPSG:4326">
+        <vl-view :zoom="zoom"
+                 :center="center"
+                 :max-zoom="maxZoom"
+                 :min-zoom="minZoom"
+                 :rotation="rotation"></vl-view>
+
+        <vl-layer-tile>
+          <vl-source-osm></vl-source-osm>
+        </vl-layer-tile>
+
+        <vl-layer-vector>
+          <vl-source-vector :features="features"></vl-source-vector>
+        </vl-layer-vector>
+
+        <vl-layer-vector>
+          <vl-source-vector ident="draw-target"></vl-source-vector>
+        </vl-layer-vector>
+        <vl-interaction-draw source="draw-target" type="Polygon"></vl-interaction-draw>
+        <vl-interaction-snap source="draw-target"></vl-interaction-snap>
+        <vl-interaction-modify source="draw-target"></vl-interaction-modify>
+
+      </vl-map>
+    </div>
+    <div>
+      <button @@click="test">test</button>
+    </div>
+  </div>
+
+  <script src="https://unpkg.com/vue@latest/dist/vue.min.js"></script>
+  <script src="../lib/index.umd.js"></script>
+  <script>
+    /* eslint-disable no-new */
+    new Vue({
+      el: '#app',
+      data: {
+        center: [37.41, 8.82],
+        rotation: 0,
+        zoom: 5,
+        maxZoom: 5,
+        minZoom: 5,
+        features: [
+          {
+            id: 'd45bdba2-84b7-46d9-80a0-64b78c67acd1',
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [37.41, 15.82],
+            },
+            properties: {
+              name: 'Point 1',
+              color: 'yellow',
+              value: 100,
+            },
+          },
+          {
+            id: 'd45bdba2-84b7-46d9-80a0-64b78c67acd2',
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [30.41, 10.82],
+            },
+            properties: {
+              name: 'Point 2',
+              color: 'yellow',
+              value: 50,
+            },
+          },
+          {
+            id: 'd45bdba2-84b7-46d9-80a0-64b78c67acd3',
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [47.41, 15.82],
+            },
+            properties: {
+              name: 'Point 3',
+              color: 'yellow',
+              value: 0,
+            },
+          },
+        ],
+      },
+      methods: {
+        formatText (f) {
+          return `${f.properties.name} ${f.properties.value}%`
+        },
+        test () {
+          setInterval(() => {
+            for (let i = 0; i < this.features.length; i++) {
+              let color = ['blue', 'yellow', 'green', 'pink'][Math.ceil(Math.random() * 100) % 4]
+              let value = Math.ceil(Math.random() * 100)
+              this.features[i].properties.color = color
+              this.features[i].properties.value = value
+            }
+          }, 1000)
+        },
+      },
+    })
+  </script>
 </body>
 </html>