commit

@@ -3,7 +3,7 @@ import './index.scss'
 import api from '../../api'
 import yaSDK from 'yoho-activity-sdk';
 import cookie from 'react-cookies';
-
+import queryString from 'query-string'
 
 import Resource from '../components/resource';
 import BottomButton from '../components/bottom-button';
@@ -15,7 +15,8 @@ export default class wheelSurf extends PureComponent {
         super(props);
         this.state = {
             uid: 0,
-            expIdx: 1,
+            user: {},
+            epPrize: {},
             query: {},
             canStart: true,    // 可以抽奖
             slowEnding: false, // 减速结束
@@ -24,6 +25,7 @@ export default class wheelSurf extends PureComponent {
             startType: true,
             isLogin: false,
             dayLeftTimesTip: '',
+            showRemain: false,
 
             conf: {
                 loading: ''
@@ -46,76 +48,136 @@ export default class wheelSurf extends PureComponent {
     }
 
     init = async () => {
-
-        // 登录状态
         this.state.query = yaSDK.getQueryObj() || {};
-        this.state.uid = +(this.state.query.uid  || cookie.load('uid') || 0);
         
-        yaSDK.getUid().then(async (uid) => {
-            if (uid && uid === this.state.uid) {
-                this.setState({
-                    uid,
-                    isLogin: !!uid
-                });
-                
-                switch (yaSDK.env) {
-                    case 'h5':
-                        if (!cookie.load('uid')) {
-                            cookie.save('uid', this.state.uid);
-                            cookie.save('app_session_key', this.state.query.session_key, { path: '/' });
-                            cookie.save('app_client_type', this.state.query.app_client_type, { path: '/' });
-                            cookie.save('app_version', this.state.query.app_version, { path: '/' });
-                        }
-                        break;
-                        
-                    case 'miniprogram':
-                        cookie.save('uid', this.state.uid);
-                        cookie.save('app_session_key', this.state.query.session_key, { path: '/' });
-                        cookie.save('app_client_type', this.state.query.client_type, { path: '/' });
-                        cookie.save('app_version', '6.6.0', { path: '/' });
-                        break;
-                        
-                    case 'app':
-                        cookie.save('uid', this.state.uid);
-                        cookie.save('app_session_key', this.state.query.session_key, { path: '/' });
-                        cookie.save('app_client_type', this.state.query.client_type, { path: '/' });
-                        cookie.save('app_version', this.state.query.app_version, { path: '/' });
-                        break;
-                        
-                    default:
-                        break;
-                    
+        let user = await yaSDK.getUser();
+        let {uid, sessionKey} = user;
+        
+        this.state.user = user;
+        
+        let setLogin = userInfo => {
+            this.setState({
+              uid: userInfo.uid,
+              isLogin: true
+            });
+  
+            switch (yaSDK.env) {
+              case 'h5':
+                if (!cookie.load('uid')) {
+                  cookie.save('uid', userInfo.uid);
+                  cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
+                  cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
+                  cookie.save('app_version', userInfo.appVersion, { path: '/' });
                 }
-            } else {
-                cookie.remove('uid');
-                cookie.remove('app_session_key');
-                cookie.remove('app_client_type');
-                cookie.remove('app_version');
+                break;
+  
+              case 'miniprogram':
+                cookie.save('uid', userInfo.uid);
+                cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
+                cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
+                cookie.save('app_version', '6.6.0', { path: '/' });
+                break;
+  
+              case 'app':
+                cookie.save('uid', userInfo.uid);
+                cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
+                cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
+                cookie.save('app_version', userInfo.appVersion, { path: '/' });
+                break;
+  
+              default:
+                break;
+  
             }
+        };
+        
+        let updateCount = async (user) => {                                      
+            let result = await api.conf({
+              uid: user.uid,
+              act_id: +this.state.query.actId
+            });
             
-            let params = {act_id: +this.state.query.actId};
+            if (result && result.code === 200) {
+              this.setState({
+                remainCount: result.data.residueCount,
+                showRemain: true
+              });
+            }
+        };
+        
+        if (uid && sessionKey) {
+            setLogin(user);
+        } else {
+            cookie.remove('uid');
+            cookie.remove('app_session_key');
+            cookie.remove('app_client_type');
+            cookie.remove('app_version');
             
-            if (this.state.uid) {
-                params.uid = this.state.uid;
+            // fix android can't auto reload page after login
+            if (yaSDK.env === 'app') {
+              let timer = setInterval(async () => {
+                  let user = await yaSDK.getUser();
+                  
+                  if (user.uid && user.sessionKey) {
+                    clearInterval(timer);
+                    setLogin(user);
+                    updateCount(user);
+                  }
+              }, 2000);
             }
+        }
+               
+        let params = {act_id: +this.state.query.actId};
+        
+        if (uid) {
+            params.uid = uid;
+        }
 
-            let result = await api.conf(params);
+        let result = await api.conf(params);
 
-            if (result.code === 200) {
-                this.setState({
-                    conf: result.data.conf,
-                    expIdx: result.data.prize_idx,
-                    totalParts: result.data.prize,
-                    remainCount: result.data.residueCount,
-                    dayLeftTimesTip: result.data.conf.btm_tip_one,
-                    startType: result.data.startType !== false,
-                    startErrorMsg: result.data.errorMsg || ''
-                });
-                this.setWxShare();
-            } else {
-                console.log(result.message)
+        if (result.code === 200) {
+          
+            if (yaSDK.env === 'miniprogram') {
+              this.simplifyUrl(result.data.conf);
             }
-        });
+          
+            this.setState({
+                conf: result.data.conf,
+                epPrize: result.data.emptyPrize,
+                totalParts: result.data.prize,
+                remainCount: result.data.residueCount,
+                showRemain: +uid > 0,
+                dayLeftTimesTip: result.data.conf.btm_tip_one,
+                startType: result.data.startType !== false,
+                startErrorMsg: result.data.errorMsg || ''
+            });
+            this.setWxShare();
+        } else {
+            console.log(result.message)
+        }
+    };
+
+    simplifyUrl = (conf) => {
+      const spKeys = [
+        'rule_url', 
+        'jump_btn_left_url', 
+        'jump_btn_middle_url', 
+        'jump_btn_right_url'
+      ];
+      
+      let url, query;
+      spKeys.map(key => {
+        if (!conf[key] || !conf[key].split('?')[1]) {
+          return;
+        }
+        
+        url = conf[key].split('?')[0];
+        query = queryString.parse(conf[key].split('?')[1]);
+        
+        delete query['openby:yohobuy'];
+        
+        conf[key] = `${url}?${queryString.stringify(query)}`;
+      });
     };
 
     setWxShare = () => {
@@ -130,39 +192,52 @@ export default class wheelSurf extends PureComponent {
     };
 
     begin = async () => {
-        console.log('开始抽奖');
-        
         this.state.canStart = false;
         this.setState({
             remainCount: this.state.remainCount - 1
         });
         
-        let result = await start({
-            act_id: +this.state.query.actId,
-            uid: cookie.load('uid'),
-            sessionKey: cookie.load('app_session_key'),
-            sessionType: cookie.load('app_client_type'),
-            appVersion: cookie.load('app_version')
-        });
+        let result;
         
-        if (result.code !== 200) {
+        try {
+          result = await api.start({
+            act_id: +this.state.query.actId,
+            uid: this.state.user.uid,
+            sessionKey: this.state.user.sessionKey,
+            sessionType: this.state.user.sessionType,
+            appVersion: this.state.user.appVersion
+          });
+
+          if (result.code !== 200) {
             result = {
               data: {
-                prize_idx: this.state.expIdx
+                type: 1,
+                prize_idx: this.state.epPrize.prize_idx,
+                desc: 'oops!'
               }
             }
+          }
+        } catch (e) {
+            console.log(e)
+          result = {
+            data: {
+              type: 1,
+              prize_idx: this.state.epPrize.prize_idx,
+              desc: 'oops!'
+            }
+          }
         }
         
         let timer = setTimeout(() => {
             clearTimeout(timer);
             this.state.stopAngle = this.calcStopAngle(result.data.prize_idx);
-            this.state.gotDesc = result.data.desc;
+            this.state.gotDesc = result.data.type === 1 ? 'oops!' : '恭喜您！中奖了';
             this.setState({
                 slowEnding: true
             });
             this.state.angle = this.state.stopAngle;
             this.stop(this.state.stopAngle);
-        }, 4000);
+        }, 2000);
     };
 
     calcStopAngle = idx => {
@@ -203,7 +278,7 @@ export default class wheelSurf extends PureComponent {
     };
     
     stop = angle => {
-        let rotateDeg = angle + 360 * 5;
+        let rotateDeg = angle + 360 * 3;
         let randCssName = 'stop_' + (new Date()).getTime();
         let randCssContent = '{' +
             'transform: rotateZ(' + rotateDeg + 'deg) !important;' +
@@ -315,12 +390,8 @@ export default class wheelSurf extends PureComponent {
     };
 
     render() {
-        let {conf, slowEnding, isLogin, startEnded, remainCount, dayLeftTimesTip} = this.state;
+        let {conf, slowEnding, isLogin, startEnded, remainCount, showRemain} = this.state;
         
-        if (dayLeftTimesTip) {
-            dayLeftTimesTip = dayLeftTimesTip.replace(/\{\$1\}/ig, remainCount);
-        }
-
         if (!conf.id) {
             return (
                 <div className="home-wrap">
@@ -341,9 +412,9 @@ export default class wheelSurf extends PureComponent {
                 <img className="wheel-bg" id="rotateWheel" src={conf.wheel_bg}/>
                 <img onClick={()=>{this.start()}} className="start-btn-bg" src={conf.prize_btn_bg}/>
                 {
-                    isLogin ?
+                    isLogin && showRemain ?
                         (<div className="tips">
-                            <p className="tip-1">{dayLeftTimesTip}</p>
+                            <p className="tip-1">{`今日剩余次数：${remainCount}次`}</p>
                         </div>) : ''
                 }
     
@@ -357,7 +428,6 @@ export default class wheelSurf extends PureComponent {
                         <span onClick={this.setCanStart} className="try-again">确定</span>
                     </div>
                 ) : ''}
-                {startEnded ? (<span onClick={this.setCanStart} className="close-prize-hit-bg">关闭</span>) : ''}
                 {slowEnding ? (<img className="prize-hit-start-bg" src={conf.prize_btn_bg}/>) : ''}
                 {
                     this.state.showTipModal ? <TipModal tip={this.state.modalTip} btnText={this.state.modalBtnText} confirm={() => {this.confirm()}} /> : ''

@@ -3,6 +3,7 @@
     width: 100%;
     height: 100%;
     overflow-x: hidden;
+    font-size: 0;
 
     .main-bg {
         width: 100%;

@@ -2,7 +2,7 @@ import React, {PureComponent} from 'react';
 import './index.scss'
 import api from '../../api';
 import yaSDK from 'yoho-activity-sdk';
-import config from '../../../../config';
+import * as config from '../../../../config';
 import wx from 'weixin-js-sdk';
 import TipModal from '../components/tip-modal';
 import dayjs from 'dayjs';
@@ -15,7 +15,7 @@ export default class Prize extends PureComponent {
             prizes: [],
             pending: true,
             showModal: false,
-            modalTip: '请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服',
+            modalTip: '请保持信息畅通，我们的客服人员会在2个工作日联系您！',
             modalBtnText: '确定'
         };
     }
@@ -50,24 +50,26 @@ export default class Prize extends PureComponent {
         yaSDK.link(e);
     };
     
-    componentDidMount() {
-        yaSDK.getUid().then(async uid => {
-            let result = await api.prize({
-                act_id: +yaSDK.getQueryObj().actId,
-                uid: uid || +yaSDK.getQueryObj().uid  
-            }); 
+    async componentDidMount() {
+        let user = await yaSDK.getUser();
+        let {uid} = user;
             
-            this.setState({
-                pending: false,
-                prizes: result.data
-            });
+        let result = await api.prize({
+            act_id: +yaSDK.getQueryObj().actId,
+            uid: uid || +yaSDK.getQueryObj().uid  
+        }); 
+        
+        this.setState({
+            pending: false,
+            prizes: result.data
         });
     }
 
     render() {
         let {showModal, modalTip, modalBtnText, pending} = this.state;
-        let backUrl = `${document.location.protocol}//${document.location.host}${config.routerPath}/home.html?actId=${yaSDK.getQueryObj().actId}`;
+        let backUrl = `${document.location.protocol}//${document.location.host}${config.routerPath[config.currentApp]}/home.html?actId=${yaSDK.getQueryObj().actId}`;
         
+        console.log(backUrl)
         let couponLink = 'https://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}';
         let redEnvelopeLink = 'https://activity.yoho.cn/feature/3221.html?title=我的红包&openby:yohobuy={"action":"go.mineredpackage"}';
 
@@ -91,6 +93,7 @@ export default class Prize extends PureComponent {
                                     </div>
                                 </div>
                                 <div className="item-bottom">
+                                    <div className="fix-line"></div>
                                     <span onClick={(event) => this.detail(event, prize)} data-type="other" 
                                           data-url={prize.type === 2 ? redEnvelopeLink : (prize.type === 3 ? couponLink : '')}
                                           className="detail">去查看

@@ -4,7 +4,8 @@ body {
 
 .my-prize-wrap {
     padding: 20px 30px;
-    
+    font-size: 0;
+
     .prize-item {
         background-color: #FFFFFF;
         height: 300px;
@@ -20,7 +21,6 @@ body {
         height: 220px;
         padding: 40px 30px;
         box-sizing: border-box;
-        border-bottom: 1px solid #e0e0e0;
         
         .prize-img {
             position: absolute;
@@ -62,8 +62,19 @@ body {
     }
     
     .item-bottom {
+        position: relative;
         height: 80px;
         
+        .fix-line {
+            position: absolute;
+            height: 1px;
+            top: 0;
+            left: 0;
+            right: 0;
+            background-color: #e0e0e0;
+            transform: scale(1, 0.5);
+        }
+        
         .detail {
             position: relative;
             height: 80px;

+// github: https://github.com/sindresorhus/query-string
+// update: https://wzrd.in/standalone/query-string@latest
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;r="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,r.queryString=e()}}(function(){return function e(r,n,t){function o(c,u){if(!n[c]){if(!r[c]){var a="function"==typeof require&&require;if(!u&&a)return a(c,!0);if(i)return i(c,!0);var f=new Error("Cannot find module '"+c+"'");throw f.code="MODULE_NOT_FOUND",f}var s=n[c]={exports:{}};r[c][0].call(s.exports,function(e){var n=r[c][1][e];return o(n?n:e)},s,s.exports,e,r,n,t)}return n[c].exports}for(var i="function"==typeof require&&require,c=0;c<t.length;c++)o(t[c]);return o}({1:[function(e,r,n){"use strict";function t(e){switch(e.arrayFormat){case"index":return function(r,n,t){return null===n?[i(r,e),"[",t,"]"].join(""):[i(r,e),"[",i(t,e),"]=",i(n,e)].join("")};case"bracket":return function(r,n){return null===n?i(r,e):[i(r,e),"[]=",i(n,e)].join("")};default:return function(r,n){return null===n?i(r,e):[i(r,e),"=",i(n,e)].join("")}}}function o(e){var r;switch(e.arrayFormat){case"index":return function(e,n,t){return r=/\[(\d*)\]$/.exec(e),e=e.replace(/\[\d*\]$/,""),r?(void 0===t[e]&&(t[e]={}),void(t[e][r[1]]=n)):void(t[e]=n)};case"bracket":return function(e,n,t){return r=/(\[\])$/.exec(e),e=e.replace(/\[\]$/,""),r?void 0===t[e]?void(t[e]=[n]):void(t[e]=[].concat(t[e],n)):void(t[e]=n)};default:return function(e,r,n){return void 0===n[e]?void(n[e]=r):void(n[e]=[].concat(n[e],r))}}}function i(e,r){return r.encode?r.strict?u(e):encodeURIComponent(e):e}function c(e){return Array.isArray(e)?e.sort():"object"==typeof e?c(Object.keys(e)).sort(function(e,r){return Number(e)-Number(r)}).map(function(r){return e[r]}):e}var u=e("strict-uri-encode"),a=e("object-assign"),f=e("decode-uri-component");n.extract=function(e){var r=e.indexOf("?");return r===-1?"":e.slice(r+1)},n.parse=function(e,r){r=a({arrayFormat:"none"},r);var n=o(r),t=Object.create(null);return"string"!=typeof e?t:(e=e.trim().replace(/^[?#&]/,""))?(e.split("&").forEach(function(e){var r=e.replace(/\+/g," ").split("="),o=r.shift(),i=r.length>0?r.join("="):void 0;i=void 0===i?null:f(i),n(f(o),i,t)}),Object.keys(t).sort().reduce(function(e,r){var n=t[r];return Boolean(n)&&"object"==typeof n&&!Array.isArray(n)?e[r]=c(n):e[r]=n,e},Object.create(null))):t},n.stringify=function(e,r){var n={encode:!0,strict:!0,arrayFormat:"none"};r=a(n,r);var o=t(r);return e?Object.keys(e).sort().map(function(n){var t=e[n];if(void 0===t)return"";if(null===t)return i(n,r);if(Array.isArray(t)){var c=[];return t.slice().forEach(function(e){void 0!==e&&c.push(o(n,e,c.length))}),c.join("&")}return i(n,r)+"="+i(t,r)}).filter(function(e){return e.length>0}).join("&"):""}},{"decode-uri-component":2,"object-assign":3,"strict-uri-encode":4}],2:[function(e,r,n){"use strict";function t(e,r){try{return decodeURIComponent(e.join(""))}catch(e){}if(1===e.length)return e;r=r||1;var n=e.slice(0,r),o=e.slice(r);return Array.prototype.concat.call([],t(n),t(o))}function o(e){try{return decodeURIComponent(e)}catch(o){for(var r=e.match(u),n=1;n<r.length;n++)e=t(r,n).join(""),r=e.match(u);return e}}function i(e){for(var r={"%FE%FF":"��","%FF%FE":"��"},n=a.exec(e);n;){try{r[n[0]]=decodeURIComponent(n[0])}catch(e){var t=o(n[0]);t!==n[0]&&(r[n[0]]=t)}n=a.exec(e)}r["%C2"]="�";for(var i=Object.keys(r),c=0;c<i.length;c++){var u=i[c];e=e.replace(new RegExp(u,"g"),r[u])}return e}var c="%[a-f0-9]{2}",u=new RegExp(c,"gi"),a=new RegExp("("+c+")+","gi");r.exports=function(e){if("string"!=typeof e)throw new TypeError("Expected `encodedURI` to be of type `string`, got `"+typeof e+"`");try{return e=e.replace(/\+/g," "),decodeURIComponent(e)}catch(r){return i(e)}}},{}],3:[function(e,r,n){"use strict";function t(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}function o(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var r={},n=0;n<10;n++)r["_"+String.fromCharCode(n)]=n;var t=Object.getOwnPropertyNames(r).map(function(e){return r[e]});if("0123456789"!==t.join(""))return!1;var o={};return"abcdefghijklmnopqrst".split("").forEach(function(e){o[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},o)).join("")}catch(e){return!1}}var i=Object.getOwnPropertySymbols,c=Object.prototype.hasOwnProperty,u=Object.prototype.propertyIsEnumerable;r.exports=o()?Object.assign:function(e,r){for(var n,o,a=t(e),f=1;f<arguments.length;f++){n=Object(arguments[f]);for(var s in n)c.call(n,s)&&(a[s]=n[s]);if(i){o=i(n);for(var d=0;d<o.length;d++)u.call(n,o[d])&&(a[o[d]]=n[o[d]])}}return a}},{}],4:[function(e,r,n){"use strict";r.exports=function(e){return encodeURIComponent(e).replace(/[!'()*]/g,function(e){return"%"+e.charCodeAt(0).toString(16).toUpperCase()})}},{}]},{},[1])(1)});

@@ -71,7 +71,7 @@
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.3",
     "webpack-merge": "^4.1.4",
-    "yoho-activity-sdk": "1.0.7"
+    "yoho-activity-sdk": "1.0.8"
   },
   "author": "陈峰 <feng.chen@yoho.cn>",
   "license": "ISC",

@@ -6,7 +6,6 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const config = require("./config");
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 
 const appHtmls = require('./app/' + config.currentApp + '/title');
 
@@ -30,7 +29,6 @@ let plugins = [
         chunkFilename: "css/[id].css"
     }),//css分离
     new CleanWebpackPlugin(pathsToClean, cleanOptions),//清除历史版本
-    new BundleAnalyzerPlugin()
 ].concat(Object.keys(appHtmls).map(title => {
     return new HtmlWebpackPlugin({
         filename: title + '.html',

@@ -631,15 +631,7 @@
     globals "^11.1.0"
     lodash "^4.17.10"
 
-"@babel/types@^7.0.0":
-  version "7.1.2"
-  resolved "http://npm.yohops.com/@babel%2ftypes/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.1.2", "@babel/types@^7.1.3":
+"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
   version "7.1.3"
   resolved "http://npm.yohops.com/@babel%2ftypes/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
   dependencies:
@@ -809,7 +801,7 @@ ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "http://npm.yohops.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.3.0:
   version "5.5.2"
   resolved "http://npm.yohops.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -995,21 +987,21 @@ autoprefixer@^6.3.1:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^9.1.4:
-  version "9.1.5"
-  resolved "http://npm.yohops.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
+  version "9.2.1"
+  resolved "http://npm.yohops.com/autoprefixer/-/autoprefixer-9.2.1.tgz#1f2f1179ceed4711b7ab064dbd5c3f9e83d9dc62"
   dependencies:
-    browserslist "^4.1.0"
-    caniuse-lite "^1.0.30000884"
+    browserslist "^4.2.1"
+    caniuse-lite "^1.0.30000892"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.2"
-    postcss-value-parser "^3.2.3"
+    postcss "^7.0.5"
+    postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "http://npm.yohops.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "http://npm.yohops.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
@@ -1099,21 +1091,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "http://npm.yohops.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "http://npm.yohops.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
-
 body-parser@1.18.3:
   version "1.18.3"
   resolved "http://npm.yohops.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
@@ -1230,13 +1207,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^4.1.0:
-  version "4.2.0"
-  resolved "http://npm.yohops.com/browserslist/-/browserslist-4.2.0.tgz#3e5e5edf7fa9758ded0885cf88c1e4be753a591c"
+browserslist@^4.1.0, browserslist@^4.2.1:
+  version "4.3.0"
+  resolved "http://npm.yohops.com/browserslist/-/browserslist-4.3.0.tgz#779a235bd1ace0f3841a9b294df4cd47ac046c9d"
   dependencies:
-    caniuse-lite "^1.0.30000889"
-    electron-to-chromium "^1.3.73"
-    node-releases "^1.0.0-alpha.12"
+    caniuse-lite "^1.0.30000893"
+    electron-to-chromium "^1.3.80"
+    node-releases "^1.0.0-alpha.14"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -1338,12 +1315,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000890"
-  resolved "http://npm.yohops.com/caniuse-db/-/caniuse-db-1.0.30000890.tgz#b406595db8b631975b8dc5fa174f32925c23778b"
+  version "1.0.30000893"
+  resolved "http://npm.yohops.com/caniuse-db/-/caniuse-db-1.0.30000893.tgz#2781b8d2ce50d8dd9d091425461b528ca4556c07"
 
-caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000889:
-  version "1.0.30000890"
-  resolved "http://npm.yohops.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf"
+caniuse-lite@^1.0.30000892, caniuse-lite@^1.0.30000893:
+  version "1.0.30000893"
+  resolved "http://npm.yohops.com/caniuse-lite/-/caniuse-lite-1.0.30000893.tgz#284b20932bd41b93e21626975f2050cb01561986"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1528,13 +1505,7 @@ colors@~1.1.2:
   version "1.1.2"
   resolved "http://npm.yohops.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "http://npm.yohops.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "http://npm.yohops.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   dependencies:
@@ -1671,8 +1642,8 @@ copy-descriptor@^0.1.0:
   resolved "http://npm.yohops.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
 copy-webpack-plugin@^4.5.1:
-  version "4.5.2"
-  resolved "http://npm.yohops.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
+  version "4.5.4"
+  resolved "http://npm.yohops.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -1894,8 +1865,8 @@ debug@=3.1.0:
     ms "2.0.0"
 
 debug@^3.1.0:
-  version "3.2.5"
-  resolved "http://npm.yohops.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+  version "3.2.6"
+  resolved "http://npm.yohops.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   dependencies:
     ms "^2.1.1"
 
@@ -1976,11 +1947,7 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "http://npm.yohops.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "http://npm.yohops.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "http://npm.yohops.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -2091,8 +2058,8 @@ duplexer@^0.1.1:
   resolved "http://npm.yohops.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "http://npm.yohops.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  version "3.6.1"
+  resolved "http://npm.yohops.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2114,9 +2081,9 @@ ejs@^2.6.1:
   version "2.6.1"
   resolved "http://npm.yohops.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.73:
-  version "1.3.75"
-  resolved "http://npm.yohops.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz#dd04551739e7371862b0ac7f4ddaa9f3f95b7e68"
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.80:
+  version "1.3.80"
+  resolved "http://npm.yohops.com/electron-to-chromium/-/electron-to-chromium-1.3.80.tgz#e99ec7efe64c2c6a269d3885ff411ea88852fa53"
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -2288,42 +2255,7 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-express@^4.16.2:
-  version "4.16.3"
-  resolved "http://npm.yohops.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    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.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-express@^4.16.3:
+express@^4.16.2, express@^4.16.3:
   version "4.16.4"
   resolved "http://npm.yohops.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   dependencies:
@@ -2371,7 +2303,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.1, extend@~3.0.2:
+extend@~3.0.2:
   version "3.0.2"
   resolved "http://npm.yohops.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
@@ -2518,12 +2450,12 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "http://npm.yohops.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.3.1, form-data@~2.3.2:
-  version "2.3.2"
-  resolved "http://npm.yohops.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "http://npm.yohops.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
@@ -2711,13 +2643,6 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "http://npm.yohops.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "http://npm.yohops.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "http://npm.yohops.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -2893,15 +2818,6 @@ http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "http://npm.yohops.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "http://npm.yohops.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "http://npm.yohops.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -2944,10 +2860,6 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "http://npm.yohops.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "http://npm.yohops.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "http://npm.yohops.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -3674,15 +3586,15 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "http://npm.yohops.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "http://npm.yohops.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "http://npm.yohops.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  version "2.1.21"
+  resolved "http://npm.yohops.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.37.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -3697,8 +3609,8 @@ mimic-fn@^1.0.0:
   resolved "http://npm.yohops.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
 mini-css-extract-plugin@^0.4.3:
-  version "0.4.3"
-  resolved "http://npm.yohops.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8"
+  version "0.4.4"
+  resolved "http://npm.yohops.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -3734,8 +3646,8 @@ minipass@^2.2.1, minipass@^2.3.3:
     yallist "^3.0.0"
 
 minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "http://npm.yohops.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  version "1.1.1"
+  resolved "http://npm.yohops.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
   dependencies:
     minipass "^2.2.1"
 
@@ -3847,8 +3759,8 @@ negotiator@0.6.1:
   resolved "http://npm.yohops.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "http://npm.yohops.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+  version "2.6.0"
+  resolved "http://npm.yohops.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -3928,15 +3840,15 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.12:
-  version "1.0.0-alpha.12"
-  resolved "http://npm.yohops.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
+node-releases@^1.0.0-alpha.14:
+  version "1.0.0-alpha.14"
+  resolved "http://npm.yohops.com/node-releases/-/node-releases-1.0.0-alpha.14.tgz#da9e2780add4bbb59ad890af9e2018a1d9c0034b"
   dependencies:
     semver "^5.3.0"
 
 node-sass@^4.9.3:
-  version "4.9.3"
-  resolved "http://npm.yohops.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  version "4.9.4"
+  resolved "http://npm.yohops.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -3953,7 +3865,7 @@ node-sass@^4.9.3:
     nan "^2.10.0"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
-    request "2.87.0"
+    request "^2.88.0"
     sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
@@ -4039,10 +3951,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "http://npm.yohops.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "http://npm.yohops.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "http://npm.yohops.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -4375,8 +4283,8 @@ pkg-dir@^3.0.0:
     find-up "^3.0.0"
 
 portfinder@^1.0.9:
-  version "1.0.17"
-  resolved "http://npm.yohops.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+  version "1.0.18"
+  resolved "http://npm.yohops.com/portfinder/-/portfinder-1.0.18.tgz#cf1106ff336fd4329b7ce32fda7d17d62c6bcf37"
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -4634,9 +4542,9 @@ postcss-unique-selectors@^2.0.2:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "http://npm.yohops.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+  version "3.3.1"
+  resolved "http://npm.yohops.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
 
 postcss-zindex@^2.0.1:
   version "2.2.0"
@@ -4663,7 +4571,7 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
   version "7.0.5"
   resolved "http://npm.yohops.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
   dependencies:
@@ -4705,7 +4613,7 @@ prop-types@^15.5.0, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.4:
+proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "http://npm.yohops.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
   dependencies:
@@ -4766,11 +4674,7 @@ q@^1.1.2:
   version "1.5.1"
   resolved "http://npm.yohops.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@6.5.1:
-  version "6.5.1"
-  resolved "http://npm.yohops.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "http://npm.yohops.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -4798,8 +4702,8 @@ querystring@0.2.0:
   resolved "http://npm.yohops.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
 querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "http://npm.yohops.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+  version "2.1.0"
+  resolved "http://npm.yohops.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
@@ -4818,15 +4722,6 @@ range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
   resolved "http://npm.yohops.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "http://npm.yohops.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
-
 raw-body@2.3.3:
   version "2.3.3"
   resolved "http://npm.yohops.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -5104,32 +4999,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.87.0:
-  version "2.87.0"
-  resolved "http://npm.yohops.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  dependencies:
-    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"
-
-request@^2.87.0:
+request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "http://npm.yohops.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
@@ -5221,10 +5091,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "http://npm.yohops.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "http://npm.yohops.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -5302,16 +5168,12 @@ select-hose@^2.0.0:
   resolved "http://npm.yohops.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
 
 selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "http://npm.yohops.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
+  version "1.10.4"
+  resolved "http://npm.yohops.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   dependencies:
     node-forge "0.7.5"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
-  version "5.5.1"
-  resolved "http://npm.yohops.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-
-semver@^5.4.1, semver@^5.5.1:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
   version "5.6.0"
   resolved "http://npm.yohops.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
 
@@ -5388,10 +5250,6 @@ setimmediate@^1.0.4:
   version "1.0.5"
   resolved "http://npm.yohops.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "http://npm.yohops.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "http://npm.yohops.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -5481,8 +5339,8 @@ sort-keys@^1.0.0:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "http://npm.yohops.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  version "2.0.1"
+  resolved "http://npm.yohops.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
@@ -5575,18 +5433,17 @@ sprintf-js@~1.0.2:
   resolved "http://npm.yohops.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "http://npm.yohops.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.15.1"
+  resolved "http://npm.yohops.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
 ssri@^5.2.4:
@@ -5602,7 +5459,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "http://npm.yohops.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
@@ -5776,8 +5633,8 @@ through2@^2.0.0:
     xtend "~4.0.1"
 
 thunky@^1.0.2:
-  version "1.0.2"
-  resolved "http://npm.yohops.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
+  version "1.0.3"
+  resolved "http://npm.yohops.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
 
 timers-browserify@^2.0.4:
   version "2.0.10"
@@ -5819,12 +5676,6 @@ toposort@^1.0.0:
   version "1.0.7"
   resolved "http://npm.yohops.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
 
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "http://npm.yohops.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "http://npm.yohops.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -5868,7 +5719,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "http://npm.yohops.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-type-is@~1.6.15, type-is@~1.6.16:
+type-is@~1.6.16:
   version "1.6.16"
   resolved "http://npm.yohops.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
   dependencies:
@@ -5984,8 +5835,8 @@ urix@^0.1.0:
   resolved "http://npm.yohops.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
 url-loader@^1.0.1:
-  version "1.1.1"
-  resolved "http://npm.yohops.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"
+  version "1.1.2"
+  resolved "http://npm.yohops.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
   dependencies:
     loader-utils "^1.1.0"
     mime "^2.0.3"
@@ -6040,7 +5891,7 @@ utils-merge@1.0.1:
   version "1.0.1"
   resolved "http://npm.yohops.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "http://npm.yohops.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -6202,8 +6053,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
     source-map "~0.6.1"
 
 webpack@^4.17.2:
-  version "4.20.2"
-  resolved "http://npm.yohops.com/webpack/-/webpack-4.20.2.tgz#89f6486b6bb276a91b0823453d377501fc625b5a"
+  version "4.21.0"
+  resolved "http://npm.yohops.com/webpack/-/webpack-4.21.0.tgz#bd03605c0f48c0d4aaaef78ead2769485e5afd92"
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-module-context" "1.7.8"
@@ -6367,6 +6218,6 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yoho-activity-sdk@1.0.7:
-  version "1.0.7"
-  resolved "http://npm.yohops.com/yoho-activity-sdk/-/yoho-activity-sdk-1.0.7.tgz#c7a7f28b0f80a783a1dac3e8bde08b4d99e2b2a6"
+yoho-activity-sdk@1.0.8:
+  version "1.0.8"
+  resolved "http://npm.yohops.com/yoho-activity-sdk/-/yoho-activity-sdk-1.0.8.tgz#e78bb0dbf25c22e97dd6aa283e1e4fc27659c154"