fe / yoho-activitys · Commits

Go to a project

Authored by 陈峰
Commit afbe993b5b9602d2b1fdd090e385ce251528ffb8 2 parents 4cf1c7f3 95e05d52

commit

Inline Side-by-side
Showing 8 changed files with 277 additions and 339 deletions
@@ -3,7 +3,7 @@ import './index.scss' @@ -3,7 +3,7 @@ import './index.scss'
3 import api from '../../api' 3 import api from '../../api'
4 import yaSDK from 'yoho-activity-sdk'; 4 import yaSDK from 'yoho-activity-sdk';
5 import cookie from 'react-cookies'; 5 import cookie from 'react-cookies';
6 - 6 +import queryString from 'query-string'
7 7
8 import Resource from '../components/resource'; 8 import Resource from '../components/resource';
9 import BottomButton from '../components/bottom-button'; 9 import BottomButton from '../components/bottom-button';
@@ -15,7 +15,8 @@ export default class wheelSurf extends PureComponent { @@ -15,7 +15,8 @@ export default class wheelSurf extends PureComponent {
15 super(props); 15 super(props);
16 this.state = { 16 this.state = {
17 uid: 0, 17 uid: 0,
18 - expIdx: 1, 18 + user: {},
  19 + epPrize: {},
19 query: {}, 20 query: {},
20 canStart: true, // 可以抽奖 21 canStart: true, // 可以抽奖
21 slowEnding: false, // 减速结束 22 slowEnding: false, // 减速结束
@@ -24,6 +25,7 @@ export default class wheelSurf extends PureComponent { @@ -24,6 +25,7 @@ export default class wheelSurf extends PureComponent {
24 startType: true, 25 startType: true,
25 isLogin: false, 26 isLogin: false,
26 dayLeftTimesTip: '', 27 dayLeftTimesTip: '',
  28 + showRemain: false,
27 29
28 conf: { 30 conf: {
29 loading: '' 31 loading: ''
@@ -46,76 +48,136 @@ export default class wheelSurf extends PureComponent { @@ -46,76 +48,136 @@ export default class wheelSurf extends PureComponent {
46 } 48 }
47 49
48 init = async () => { 50 init = async () => {
49 -  
50 - // 登录状态  
51 this.state.query = yaSDK.getQueryObj() || {}; 51 this.state.query = yaSDK.getQueryObj() || {};
52 - this.state.uid = +(this.state.query.uid || cookie.load('uid') || 0);  
53 52
54 - yaSDK.getUid().then(async (uid) => {  
55 - if (uid && uid === this.state.uid) {  
56 - this.setState({  
57 - uid,  
58 - isLogin: !!uid  
59 - });  
60 -  
61 - switch (yaSDK.env) {  
62 - case 'h5':  
63 - if (!cookie.load('uid')) {  
64 - cookie.save('uid', this.state.uid);  
65 - cookie.save('app_session_key', this.state.query.session_key, { path: '/' });  
66 - cookie.save('app_client_type', this.state.query.app_client_type, { path: '/' });  
67 - cookie.save('app_version', this.state.query.app_version, { path: '/' });  
68 - }  
69 - break;  
70 -  
71 - case 'miniprogram':  
72 - cookie.save('uid', this.state.uid);  
73 - cookie.save('app_session_key', this.state.query.session_key, { path: '/' });  
74 - cookie.save('app_client_type', this.state.query.client_type, { path: '/' });  
75 - cookie.save('app_version', '6.6.0', { path: '/' });  
76 - break;  
77 -  
78 - case 'app':  
79 - cookie.save('uid', this.state.uid);  
80 - cookie.save('app_session_key', this.state.query.session_key, { path: '/' });  
81 - cookie.save('app_client_type', this.state.query.client_type, { path: '/' });  
82 - cookie.save('app_version', this.state.query.app_version, { path: '/' });  
83 - break;  
84 -  
85 - default:  
86 - break;  
87 - 53 + let user = await yaSDK.getUser();
  54 + let {uid, sessionKey} = user;
  55 +
  56 + this.state.user = user;
  57 +
  58 + let setLogin = userInfo => {
  59 + this.setState({
  60 + uid: userInfo.uid,
  61 + isLogin: true
  62 + });
  63 +
  64 + switch (yaSDK.env) {
  65 + case 'h5':
  66 + if (!cookie.load('uid')) {
  67 + cookie.save('uid', userInfo.uid);
  68 + cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
  69 + cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
  70 + cookie.save('app_version', userInfo.appVersion, { path: '/' });
88 } 71 }
89 - } else {  
90 - cookie.remove('uid');  
91 - cookie.remove('app_session_key');  
92 - cookie.remove('app_client_type');  
93 - cookie.remove('app_version'); 72 + break;
  73 +
  74 + case 'miniprogram':
  75 + cookie.save('uid', userInfo.uid);
  76 + cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
  77 + cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
  78 + cookie.save('app_version', '6.6.0', { path: '/' });
  79 + break;
  80 +
  81 + case 'app':
  82 + cookie.save('uid', userInfo.uid);
  83 + cookie.save('app_session_key', userInfo.sessionKey, { path: '/' });
  84 + cookie.save('app_client_type', userInfo.sessionType, { path: '/' });
  85 + cookie.save('app_version', userInfo.appVersion, { path: '/' });
  86 + break;
  87 +
  88 + default:
  89 + break;
  90 +
94 } 91 }
  92 + };
  93 +
  94 + let updateCount = async (user) => {
  95 + let result = await api.conf({
  96 + uid: user.uid,
  97 + act_id: +this.state.query.actId
  98 + });
95 99
96 - let params = {act_id: +this.state.query.actId}; 100 + if (result && result.code === 200) {
  101 + this.setState({
  102 + remainCount: result.data.residueCount,
  103 + showRemain: true
  104 + });
  105 + }
  106 + };
  107 +
  108 + if (uid && sessionKey) {
  109 + setLogin(user);
  110 + } else {
  111 + cookie.remove('uid');
  112 + cookie.remove('app_session_key');
  113 + cookie.remove('app_client_type');
  114 + cookie.remove('app_version');
97 115
98 - if (this.state.uid) {  
99 - params.uid = this.state.uid; 116 + // fix android can't auto reload page after login
  117 + if (yaSDK.env === 'app') {
  118 + let timer = setInterval(async () => {
  119 + let user = await yaSDK.getUser();
  120 +
  121 + if (user.uid && user.sessionKey) {
  122 + clearInterval(timer);
  123 + setLogin(user);
  124 + updateCount(user);
  125 + }
  126 + }, 2000);
100 } 127 }
  128 + }
  129 +
  130 + let params = {act_id: +this.state.query.actId};
  131 +
  132 + if (uid) {
  133 + params.uid = uid;
  134 + }
101 135
102 - let result = await api.conf(params); 136 + let result = await api.conf(params);
103 137
104 - if (result.code === 200) {  
105 - this.setState({  
106 - conf: result.data.conf,  
107 - expIdx: result.data.prize_idx,  
108 - totalParts: result.data.prize,  
109 - remainCount: result.data.residueCount,  
110 - dayLeftTimesTip: result.data.conf.btm_tip_one,  
111 - startType: result.data.startType !== false,  
112 - startErrorMsg: result.data.errorMsg || ''  
113 - });  
114 - this.setWxShare();  
115 - } else {  
116 - console.log(result.message) 138 + if (result.code === 200) {
  139 +
  140 + if (yaSDK.env === 'miniprogram') {
  141 + this.simplifyUrl(result.data.conf);
117 } 142 }
118 - }); 143 +
  144 + this.setState({
  145 + conf: result.data.conf,
  146 + epPrize: result.data.emptyPrize,
  147 + totalParts: result.data.prize,
  148 + remainCount: result.data.residueCount,
  149 + showRemain: +uid > 0,
  150 + dayLeftTimesTip: result.data.conf.btm_tip_one,
  151 + startType: result.data.startType !== false,
  152 + startErrorMsg: result.data.errorMsg || ''
  153 + });
  154 + this.setWxShare();
  155 + } else {
  156 + console.log(result.message)
  157 + }
  158 + };
  159 +
  160 + simplifyUrl = (conf) => {
  161 + const spKeys = [
  162 + 'rule_url',
  163 + 'jump_btn_left_url',
  164 + 'jump_btn_middle_url',
  165 + 'jump_btn_right_url'
  166 + ];
  167 +
  168 + let url, query;
  169 + spKeys.map(key => {
  170 + if (!conf[key] || !conf[key].split('?')[1]) {
  171 + return;
  172 + }
  173 +
  174 + url = conf[key].split('?')[0];
  175 + query = queryString.parse(conf[key].split('?')[1]);
  176 +
  177 + delete query['openby:yohobuy'];
  178 +
  179 + conf[key] = `${url}?${queryString.stringify(query)}`;
  180 + });
119 }; 181 };
120 182
121 setWxShare = () => { 183 setWxShare = () => {
@@ -130,39 +192,52 @@ export default class wheelSurf extends PureComponent { @@ -130,39 +192,52 @@ export default class wheelSurf extends PureComponent {
130 }; 192 };
131 193
132 begin = async () => { 194 begin = async () => {
133 - console.log('开始抽奖');  
134 -  
135 this.state.canStart = false; 195 this.state.canStart = false;
136 this.setState({ 196 this.setState({
137 remainCount: this.state.remainCount - 1 197 remainCount: this.state.remainCount - 1
138 }); 198 });
139 199
140 - let result = await start({  
141 - act_id: +this.state.query.actId,  
142 - uid: cookie.load('uid'),  
143 - sessionKey: cookie.load('app_session_key'),  
144 - sessionType: cookie.load('app_client_type'),  
145 - appVersion: cookie.load('app_version')  
146 - }); 200 + let result;
147 201
148 - if (result.code !== 200) { 202 + try {
  203 + result = await api.start({
  204 + act_id: +this.state.query.actId,
  205 + uid: this.state.user.uid,
  206 + sessionKey: this.state.user.sessionKey,
  207 + sessionType: this.state.user.sessionType,
  208 + appVersion: this.state.user.appVersion
  209 + });
  210 +
  211 + if (result.code !== 200) {
149 result = { 212 result = {
150 data: { 213 data: {
151 - prize_idx: this.state.expIdx 214 + type: 1,
  215 + prize_idx: this.state.epPrize.prize_idx,
  216 + desc: 'oops!'
152 } 217 }
153 } 218 }
  219 + }
  220 + } catch (e) {
  221 + console.log(e)
  222 + result = {
  223 + data: {
  224 + type: 1,
  225 + prize_idx: this.state.epPrize.prize_idx,
  226 + desc: 'oops!'
  227 + }
  228 + }
154 } 229 }
155 230
156 let timer = setTimeout(() => { 231 let timer = setTimeout(() => {
157 clearTimeout(timer); 232 clearTimeout(timer);
158 this.state.stopAngle = this.calcStopAngle(result.data.prize_idx); 233 this.state.stopAngle = this.calcStopAngle(result.data.prize_idx);
159 - this.state.gotDesc = result.data.desc; 234 + this.state.gotDesc = result.data.type === 1 ? 'oops!' : '恭喜您！中奖了';
160 this.setState({ 235 this.setState({
161 slowEnding: true 236 slowEnding: true
162 }); 237 });
163 this.state.angle = this.state.stopAngle; 238 this.state.angle = this.state.stopAngle;
164 this.stop(this.state.stopAngle); 239 this.stop(this.state.stopAngle);
165 - }, 4000); 240 + }, 2000);
166 }; 241 };
167 242
168 calcStopAngle = idx => { 243 calcStopAngle = idx => {
@@ -203,7 +278,7 @@ export default class wheelSurf extends PureComponent { @@ -203,7 +278,7 @@ export default class wheelSurf extends PureComponent {
203 }; 278 };
204 279
205 stop = angle => { 280 stop = angle => {
206 - let rotateDeg = angle + 360 * 5; 281 + let rotateDeg = angle + 360 * 3;
207 let randCssName = 'stop_' + (new Date()).getTime(); 282 let randCssName = 'stop_' + (new Date()).getTime();
208 let randCssContent = '{' + 283 let randCssContent = '{' +
209 'transform: rotateZ(' + rotateDeg + 'deg) !important;' + 284 'transform: rotateZ(' + rotateDeg + 'deg) !important;' +
@@ -315,12 +390,8 @@ export default class wheelSurf extends PureComponent { @@ -315,12 +390,8 @@ export default class wheelSurf extends PureComponent {
315 }; 390 };
316 391
317 render() { 392 render() {
318 - let {conf, slowEnding, isLogin, startEnded, remainCount, dayLeftTimesTip} = this.state; 393 + let {conf, slowEnding, isLogin, startEnded, remainCount, showRemain} = this.state;
319 394
320 - if (dayLeftTimesTip) {  
321 - dayLeftTimesTip = dayLeftTimesTip.replace(/\{\$1\}/ig, remainCount);  
322 - }  
323 -  
324 if (!conf.id) { 395 if (!conf.id) {
325 return ( 396 return (
326 <div className="home-wrap"> 397 <div className="home-wrap">
@@ -341,9 +412,9 @@ export default class wheelSurf extends PureComponent { @@ -341,9 +412,9 @@ export default class wheelSurf extends PureComponent {
341 <img className="wheel-bg" id="rotateWheel" src={conf.wheel_bg}/> 412 <img className="wheel-bg" id="rotateWheel" src={conf.wheel_bg}/>
342 <img onClick={()=>{this.start()}} className="start-btn-bg" src={conf.prize_btn_bg}/> 413 <img onClick={()=>{this.start()}} className="start-btn-bg" src={conf.prize_btn_bg}/>
343 { 414 {
344 - isLogin ? 415 + isLogin && showRemain ?
345 (<div className="tips"> 416 (<div className="tips">
346 - <p className="tip-1">{dayLeftTimesTip}</p> 417 + <p className="tip-1">{`今日剩余次数：${remainCount}次`}</p>
347 </div>) : '' 418 </div>) : ''
348 } 419 }
349 420
@@ -357,7 +428,6 @@ export default class wheelSurf extends PureComponent { @@ -357,7 +428,6 @@ export default class wheelSurf extends PureComponent {
357 <span onClick={this.setCanStart} className="try-again">确定</span> 428 <span onClick={this.setCanStart} className="try-again">确定</span>
358 </div> 429 </div>
359 ) : ''} 430 ) : ''}
360 - {startEnded ? (<span onClick={this.setCanStart} className="close-prize-hit-bg">关闭</span>) : ''}  
361 {slowEnding ? (<img className="prize-hit-start-bg" src={conf.prize_btn_bg}/>) : ''} 431 {slowEnding ? (<img className="prize-hit-start-bg" src={conf.prize_btn_bg}/>) : ''}
362 { 432 {
363 this.state.showTipModal ? <TipModal tip={this.state.modalTip} btnText={this.state.modalBtnText} confirm={() => {this.confirm()}} /> : '' 433 this.state.showTipModal ? <TipModal tip={this.state.modalTip} btnText={this.state.modalBtnText} confirm={() => {this.confirm()}} /> : ''
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 width: 100%; 3 width: 100%;
4 height: 100%; 4 height: 100%;
5 overflow-x: hidden; 5 overflow-x: hidden;
  6 + font-size: 0;
6 7
7 .main-bg { 8 .main-bg {
8 width: 100%; 9 width: 100%;
@@ -2,7 +2,7 @@ import React, {PureComponent} from 'react'; @@ -2,7 +2,7 @@ import React, {PureComponent} from 'react';
2 import './index.scss' 2 import './index.scss'
3 import api from '../../api'; 3 import api from '../../api';
4 import yaSDK from 'yoho-activity-sdk'; 4 import yaSDK from 'yoho-activity-sdk';
5 -import config from '../../../../config'; 5 +import * as config from '../../../../config';
6 import wx from 'weixin-js-sdk'; 6 import wx from 'weixin-js-sdk';
7 import TipModal from '../components/tip-modal'; 7 import TipModal from '../components/tip-modal';
8 import dayjs from 'dayjs'; 8 import dayjs from 'dayjs';
@@ -15,7 +15,7 @@ export default class Prize extends PureComponent { @@ -15,7 +15,7 @@ export default class Prize extends PureComponent {
15 prizes: [], 15 prizes: [],
16 pending: true, 16 pending: true,
17 showModal: false, 17 showModal: false,
18 - modalTip: '请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服请联系客服', 18 + modalTip: '请保持信息畅通，我们的客服人员会在2个工作日联系您！',
19 modalBtnText: '确定' 19 modalBtnText: '确定'
20 }; 20 };
21 } 21 }
@@ -50,24 +50,26 @@ export default class Prize extends PureComponent { @@ -50,24 +50,26 @@ export default class Prize extends PureComponent {
50 yaSDK.link(e); 50 yaSDK.link(e);
51 }; 51 };
52 52
53 - componentDidMount() {  
54 - yaSDK.getUid().then(async uid => {  
55 - let result = await api.prize({  
56 - act_id: +yaSDK.getQueryObj().actId,  
57 - uid: uid || +yaSDK.getQueryObj().uid  
58 - }); 53 + async componentDidMount() {
  54 + let user = await yaSDK.getUser();
  55 + let {uid} = user;
59 56
60 - this.setState({  
61 - pending: false,  
62 - prizes: result.data  
63 - }); 57 + let result = await api.prize({
  58 + act_id: +yaSDK.getQueryObj().actId,
  59 + uid: uid || +yaSDK.getQueryObj().uid
  60 + });
  61 +
  62 + this.setState({
  63 + pending: false,
  64 + prizes: result.data
64 }); 65 });
65 } 66 }
66 67
67 render() { 68 render() {
68 let {showModal, modalTip, modalBtnText, pending} = this.state; 69 let {showModal, modalTip, modalBtnText, pending} = this.state;
69 - let backUrl = `${document.location.protocol}//${document.location.host}${config.routerPath}/home.html?actId=${yaSDK.getQueryObj().actId}`; 70 + let backUrl = `${document.location.protocol}//${document.location.host}${config.routerPath[config.currentApp]}/home.html?actId=${yaSDK.getQueryObj().actId}`;
70 71
  72 + console.log(backUrl)
71 let couponLink = 'https://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}'; 73 let couponLink = 'https://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}';
72 let redEnvelopeLink = 'https://activity.yoho.cn/feature/3221.html?title=我的红包&openby:yohobuy={"action":"go.mineredpackage"}'; 74 let redEnvelopeLink = 'https://activity.yoho.cn/feature/3221.html?title=我的红包&openby:yohobuy={"action":"go.mineredpackage"}';
73 75
@@ -91,6 +93,7 @@ export default class Prize extends PureComponent { @@ -91,6 +93,7 @@ export default class Prize extends PureComponent {
91 </div> 93 </div>
92 </div> 94 </div>
93 <div className="item-bottom"> 95 <div className="item-bottom">
  96 + <div className="fix-line"></div>
94 <span onClick={(event) => this.detail(event, prize)} data-type="other" 97 <span onClick={(event) => this.detail(event, prize)} data-type="other"
95 data-url={prize.type === 2 ? redEnvelopeLink : (prize.type === 3 ? couponLink : '')} 98 data-url={prize.type === 2 ? redEnvelopeLink : (prize.type === 3 ? couponLink : '')}
96 className="detail">去查看 99 className="detail">去查看
@@ -4,7 +4,8 @@ body { @@ -4,7 +4,8 @@ body {
4 4
5 .my-prize-wrap { 5 .my-prize-wrap {
6 padding: 20px 30px; 6 padding: 20px 30px;
7 - 7 + font-size: 0;
  8 +
8 .prize-item { 9 .prize-item {
9 background-color: #FFFFFF; 10 background-color: #FFFFFF;
10 height: 300px; 11 height: 300px;
@@ -20,7 +21,6 @@ body { @@ -20,7 +21,6 @@ body {
20 height: 220px; 21 height: 220px;
21 padding: 40px 30px; 22 padding: 40px 30px;
22 box-sizing: border-box; 23 box-sizing: border-box;
23 - border-bottom: 1px solid #e0e0e0;  
24 24
25 .prize-img { 25 .prize-img {
26 position: absolute; 26 position: absolute;
@@ -62,8 +62,19 @@ body { @@ -62,8 +62,19 @@ body {
62 } 62 }
63 63
64 .item-bottom { 64 .item-bottom {
  65 + position: relative;
65 height: 80px; 66 height: 80px;
66 67
  68 + .fix-line {
  69 + position: absolute;
  70 + height: 1px;
  71 + top: 0;
  72 + left: 0;
  73 + right: 0;
  74 + background-color: #e0e0e0;
  75 + transform: scale(1, 0.5);
  76 + }
  77 +
67 .detail { 78 .detail {
68 position: relative; 79 position: relative;
69 height: 80px; 80 height: 80px;
  1 +// github: https://github.com/sindresorhus/query-string
  2 +// update: https://wzrd.in/standalone/query-string@latest
  3 +
  4 +!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 @@ @@ -71,7 +71,7 @@
71 "webpack-cli": "^3.1.2", 71 "webpack-cli": "^3.1.2",
72 "webpack-dev-server": "^3.1.3", 72 "webpack-dev-server": "^3.1.3",
73 "webpack-merge": "^4.1.4", 73 "webpack-merge": "^4.1.4",
74 - "yoho-activity-sdk": "1.0.7" 74 + "yoho-activity-sdk": "1.0.8"
75 }, 75 },
76 "author": "陈峰 <feng.chen@yoho.cn>", 76 "author": "陈峰 <feng.chen@yoho.cn>",
77 "license": "ISC", 77 "license": "ISC",
@@ -6,7 +6,6 @@ const CleanWebpackPlugin = require('clean-webpack-plugin'); @@ -6,7 +6,6 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
6 const HtmlWebpackPlugin = require("html-webpack-plugin"); 6 const HtmlWebpackPlugin = require("html-webpack-plugin");
7 const config = require("./config"); 7 const config = require("./config");
8 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin"); 8 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
9 -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin  
10 9
11 const appHtmls = require('./app/' + config.currentApp + '/title'); 10 const appHtmls = require('./app/' + config.currentApp + '/title');
12 11
@@ -30,7 +29,6 @@ let plugins = [ @@ -30,7 +29,6 @@ let plugins = [
30 chunkFilename: "css/[id].css" 29 chunkFilename: "css/[id].css"
31 }),//css分离 30 }),//css分离
32 new CleanWebpackPlugin(pathsToClean, cleanOptions),//清除历史版本 31 new CleanWebpackPlugin(pathsToClean, cleanOptions),//清除历史版本
33 - new BundleAnalyzerPlugin()  
34 ].concat(Object.keys(appHtmls).map(title => { 32 ].concat(Object.keys(appHtmls).map(title => {
35 return new HtmlWebpackPlugin({ 33 return new HtmlWebpackPlugin({
36 filename: title + '.html', 34 filename: title + '.html',
@@ -631,15 +631,7 @@ @@ -631,15 +631,7 @@
631 globals "^11.1.0" 631 globals "^11.1.0"
632 lodash "^4.17.10" 632 lodash "^4.17.10"
633 633
634 -"@babel/types@^7.0.0":  
635 - version "7.1.2"  
636 - resolved "http://npm.yohops.com/@babel%2ftypes/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"  
637 - dependencies:  
638 - esutils "^2.0.2"  
639 - lodash "^4.17.10"  
640 - to-fast-properties "^2.0.0"  
641 -  
642 -"@babel/types@^7.1.2", "@babel/types@^7.1.3": 634 +"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
643 version "7.1.3" 635 version "7.1.3"
644 resolved "http://npm.yohops.com/@babel%2ftypes/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d" 636 resolved "http://npm.yohops.com/@babel%2ftypes/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
645 dependencies: 637 dependencies:
@@ -809,7 +801,7 @@ ajv-keywords@^3.1.0: @@ -809,7 +801,7 @@ ajv-keywords@^3.1.0:
809 version "3.2.0" 801 version "3.2.0"
810 resolved "http://npm.yohops.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" 802 resolved "http://npm.yohops.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
811 803
812 -ajv@^5.1.0, ajv@^5.3.0: 804 +ajv@^5.3.0:
813 version "5.5.2" 805 version "5.5.2"
814 resolved "http://npm.yohops.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" 806 resolved "http://npm.yohops.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
815 dependencies: 807 dependencies:
@@ -995,21 +987,21 @@ autoprefixer@^6.3.1: @@ -995,21 +987,21 @@ autoprefixer@^6.3.1:
995 postcss-value-parser "^3.2.3" 987 postcss-value-parser "^3.2.3"
996 988
997 autoprefixer@^9.1.4: 989 autoprefixer@^9.1.4:
998 - version "9.1.5"  
999 - resolved "http://npm.yohops.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671" 990 + version "9.2.1"
  991 + resolved "http://npm.yohops.com/autoprefixer/-/autoprefixer-9.2.1.tgz#1f2f1179ceed4711b7ab064dbd5c3f9e83d9dc62"
1000 dependencies: 992 dependencies:
1001 - browserslist "^4.1.0"  
1002 - caniuse-lite "^1.0.30000884" 993 + browserslist "^4.2.1"
  994 + caniuse-lite "^1.0.30000892"
1003 normalize-range "^0.1.2" 995 normalize-range "^0.1.2"
1004 num2fraction "^1.2.2" 996 num2fraction "^1.2.2"
1005 - postcss "^7.0.2"  
1006 - postcss-value-parser "^3.2.3" 997 + postcss "^7.0.5"
  998 + postcss-value-parser "^3.3.1"
1007 999
1008 aws-sign2@~0.7.0: 1000 aws-sign2@~0.7.0:
1009 version "0.7.0" 1001 version "0.7.0"
1010 resolved "http://npm.yohops.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" 1002 resolved "http://npm.yohops.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
1011 1003
1012 -aws4@^1.6.0, aws4@^1.8.0: 1004 +aws4@^1.8.0:
1013 version "1.8.0" 1005 version "1.8.0"
1014 resolved "http://npm.yohops.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" 1006 resolved "http://npm.yohops.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
1015 1007
@@ -1099,21 +1091,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: @@ -1099,21 +1091,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
1099 version "4.11.8" 1091 version "4.11.8"
1100 resolved "http://npm.yohops.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" 1092 resolved "http://npm.yohops.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
1101 1093
1102 -body-parser@1.18.2:  
1103 - version "1.18.2"  
1104 - resolved "http://npm.yohops.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"  
1105 - dependencies:  
1106 - bytes "3.0.0"  
1107 - content-type "~1.0.4"  
1108 - debug "2.6.9"  
1109 - depd "~1.1.1"  
1110 - http-errors "~1.6.2"  
1111 - iconv-lite "0.4.19"  
1112 - on-finished "~2.3.0"  
1113 - qs "6.5.1"  
1114 - raw-body "2.3.2"  
1115 - type-is "~1.6.15"  
1116 -  
1117 body-parser@1.18.3: 1094 body-parser@1.18.3:
1118 version "1.18.3" 1095 version "1.18.3"
1119 resolved "http://npm.yohops.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" 1096 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: @@ -1230,13 +1207,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
1230 caniuse-db "^1.0.30000639" 1207 caniuse-db "^1.0.30000639"
1231 electron-to-chromium "^1.2.7" 1208 electron-to-chromium "^1.2.7"
1232 1209
1233 -browserslist@^4.1.0:  
1234 - version "4.2.0"  
1235 - resolved "http://npm.yohops.com/browserslist/-/browserslist-4.2.0.tgz#3e5e5edf7fa9758ded0885cf88c1e4be753a591c" 1210 +browserslist@^4.1.0, browserslist@^4.2.1:
  1211 + version "4.3.0"
  1212 + resolved "http://npm.yohops.com/browserslist/-/browserslist-4.3.0.tgz#779a235bd1ace0f3841a9b294df4cd47ac046c9d"
1236 dependencies: 1213 dependencies:
1237 - caniuse-lite "^1.0.30000889"  
1238 - electron-to-chromium "^1.3.73"  
1239 - node-releases "^1.0.0-alpha.12" 1214 + caniuse-lite "^1.0.30000893"
  1215 + electron-to-chromium "^1.3.80"
  1216 + node-releases "^1.0.0-alpha.14"
1240 1217
1241 buffer-from@^1.0.0: 1218 buffer-from@^1.0.0:
1242 version "1.1.1" 1219 version "1.1.1"
@@ -1338,12 +1315,12 @@ caniuse-api@^1.5.2: @@ -1338,12 +1315,12 @@ caniuse-api@^1.5.2:
1338 lodash.uniq "^4.5.0" 1315 lodash.uniq "^4.5.0"
1339 1316
1340 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: 1317 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
1341 - version "1.0.30000890"  
1342 - resolved "http://npm.yohops.com/caniuse-db/-/caniuse-db-1.0.30000890.tgz#b406595db8b631975b8dc5fa174f32925c23778b" 1318 + version "1.0.30000893"
  1319 + resolved "http://npm.yohops.com/caniuse-db/-/caniuse-db-1.0.30000893.tgz#2781b8d2ce50d8dd9d091425461b528ca4556c07"
1343 1320
1344 -caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000889:  
1345 - version "1.0.30000890"  
1346 - resolved "http://npm.yohops.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf" 1321 +caniuse-lite@^1.0.30000892, caniuse-lite@^1.0.30000893:
  1322 + version "1.0.30000893"
  1323 + resolved "http://npm.yohops.com/caniuse-lite/-/caniuse-lite-1.0.30000893.tgz#284b20932bd41b93e21626975f2050cb01561986"
1347 1324
1348 caseless@~0.12.0: 1325 caseless@~0.12.0:
1349 version "0.12.0" 1326 version "0.12.0"
@@ -1528,13 +1505,7 @@ colors@~1.1.2: @@ -1528,13 +1505,7 @@ colors@~1.1.2:
1528 version "1.1.2" 1505 version "1.1.2"
1529 resolved "http://npm.yohops.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" 1506 resolved "http://npm.yohops.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
1530 1507
1531 -combined-stream@1.0.6:  
1532 - version "1.0.6"  
1533 - resolved "http://npm.yohops.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"  
1534 - dependencies:  
1535 - delayed-stream "~1.0.0"  
1536 -  
1537 -combined-stream@~1.0.5, combined-stream@~1.0.6: 1508 +combined-stream@^1.0.6, combined-stream@~1.0.6:
1538 version "1.0.7" 1509 version "1.0.7"
1539 resolved "http://npm.yohops.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" 1510 resolved "http://npm.yohops.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
1540 dependencies: 1511 dependencies:
@@ -1671,8 +1642,8 @@ copy-descriptor@^0.1.0: @@ -1671,8 +1642,8 @@ copy-descriptor@^0.1.0:
1671 resolved "http://npm.yohops.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" 1642 resolved "http://npm.yohops.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
1672 1643
1673 copy-webpack-plugin@^4.5.1: 1644 copy-webpack-plugin@^4.5.1:
1674 - version "4.5.2"  
1675 - resolved "http://npm.yohops.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c" 1645 + version "4.5.4"
  1646 + resolved "http://npm.yohops.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
1676 dependencies: 1647 dependencies:
1677 cacache "^10.0.4" 1648 cacache "^10.0.4"
1678 find-cache-dir "^1.0.0" 1649 find-cache-dir "^1.0.0"
@@ -1894,8 +1865,8 @@ debug@=3.1.0: @@ -1894,8 +1865,8 @@ debug@=3.1.0:
1894 ms "2.0.0" 1865 ms "2.0.0"
1895 1866
1896 debug@^3.1.0: 1867 debug@^3.1.0:
1897 - version "3.2.5"  
1898 - resolved "http://npm.yohops.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407" 1868 + version "3.2.6"
  1869 + resolved "http://npm.yohops.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
1899 dependencies: 1870 dependencies:
1900 ms "^2.1.1" 1871 ms "^2.1.1"
1901 1872
@@ -1976,11 +1947,7 @@ delegates@^1.0.0: @@ -1976,11 +1947,7 @@ delegates@^1.0.0:
1976 version "1.0.0" 1947 version "1.0.0"
1977 resolved "http://npm.yohops.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" 1948 resolved "http://npm.yohops.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
1978 1949
1979 -depd@1.1.1:  
1980 - version "1.1.1"  
1981 - resolved "http://npm.yohops.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"  
1982 -  
1983 -depd@~1.1.1, depd@~1.1.2: 1950 +depd@~1.1.2:
1984 version "1.1.2" 1951 version "1.1.2"
1985 resolved "http://npm.yohops.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" 1952 resolved "http://npm.yohops.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
1986 1953
@@ -2091,8 +2058,8 @@ duplexer@^0.1.1: @@ -2091,8 +2058,8 @@ duplexer@^0.1.1:
2091 resolved "http://npm.yohops.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" 2058 resolved "http://npm.yohops.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
2092 2059
2093 duplexify@^3.4.2, duplexify@^3.6.0: 2060 duplexify@^3.4.2, duplexify@^3.6.0:
2094 - version "3.6.0"  
2095 - resolved "http://npm.yohops.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410" 2061 + version "3.6.1"
  2062 + resolved "http://npm.yohops.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
2096 dependencies: 2063 dependencies:
2097 end-of-stream "^1.0.0" 2064 end-of-stream "^1.0.0"
2098 inherits "^2.0.1" 2065 inherits "^2.0.1"
@@ -2114,9 +2081,9 @@ ejs@^2.6.1: @@ -2114,9 +2081,9 @@ ejs@^2.6.1:
2114 version "2.6.1" 2081 version "2.6.1"
2115 resolved "http://npm.yohops.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" 2082 resolved "http://npm.yohops.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
2116 2083
2117 -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.73:  
2118 - version "1.3.75"  
2119 - resolved "http://npm.yohops.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz#dd04551739e7371862b0ac7f4ddaa9f3f95b7e68" 2084 +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.80:
  2085 + version "1.3.80"
  2086 + resolved "http://npm.yohops.com/electron-to-chromium/-/electron-to-chromium-1.3.80.tgz#e99ec7efe64c2c6a269d3885ff411ea88852fa53"
2120 2087
2121 elliptic@^6.0.0: 2088 elliptic@^6.0.0:
2122 version "6.4.1" 2089 version "6.4.1"
@@ -2288,42 +2255,7 @@ expand-brackets@^2.1.4: @@ -2288,42 +2255,7 @@ expand-brackets@^2.1.4:
2288 snapdragon "^0.8.1" 2255 snapdragon "^0.8.1"
2289 to-regex "^3.0.1" 2256 to-regex "^3.0.1"
2290 2257
2291 -express@^4.16.2:  
2292 - version "4.16.3"  
2293 - resolved "http://npm.yohops.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"  
2294 - dependencies:  
2295 - accepts "~1.3.5"  
2296 - array-flatten "1.1.1"  
2297 - body-parser "1.18.2"  
2298 - content-disposition "0.5.2"  
2299 - content-type "~1.0.4"  
2300 - cookie "0.3.1"  
2301 - cookie-signature "1.0.6"  
2302 - debug "2.6.9"  
2303 - depd "~1.1.2"  
2304 - encodeurl "~1.0.2"  
2305 - escape-html "~1.0.3"  
2306 - etag "~1.8.1"  
2307 - finalhandler "1.1.1"  
2308 - fresh "0.5.2"  
2309 - merge-descriptors "1.0.1"  
2310 - methods "~1.1.2"  
2311 - on-finished "~2.3.0"  
2312 - parseurl "~1.3.2"  
2313 - path-to-regexp "0.1.7"  
2314 - proxy-addr "~2.0.3"  
2315 - qs "6.5.1"  
2316 - range-parser "~1.2.0"  
2317 - safe-buffer "5.1.1"  
2318 - send "0.16.2"  
2319 - serve-static "1.13.2"  
2320 - setprototypeof "1.1.0"  
2321 - statuses "~1.4.0"  
2322 - type-is "~1.6.16"  
2323 - utils-merge "1.0.1"  
2324 - vary "~1.1.2"  
2325 -  
2326 -express@^4.16.3: 2258 +express@^4.16.2, express@^4.16.3:
2327 version "4.16.4" 2259 version "4.16.4"
2328 resolved "http://npm.yohops.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" 2260 resolved "http://npm.yohops.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
2329 dependencies: 2261 dependencies:
@@ -2371,7 +2303,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: @@ -2371,7 +2303,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
2371 assign-symbols "^1.0.0" 2303 assign-symbols "^1.0.0"
2372 is-extendable "^1.0.1" 2304 is-extendable "^1.0.1"
2373 2305
2374 -extend@~3.0.1, extend@~3.0.2: 2306 +extend@~3.0.2:
2375 version "3.0.2" 2307 version "3.0.2"
2376 resolved "http://npm.yohops.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" 2308 resolved "http://npm.yohops.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
2377 2309
@@ -2518,12 +2450,12 @@ forever-agent@~0.6.1: @@ -2518,12 +2450,12 @@ forever-agent@~0.6.1:
2518 version "0.6.1" 2450 version "0.6.1"
2519 resolved "http://npm.yohops.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" 2451 resolved "http://npm.yohops.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
2520 2452
2521 -form-data@~2.3.1, form-data@~2.3.2:  
2522 - version "2.3.2"  
2523 - resolved "http://npm.yohops.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" 2453 +form-data@~2.3.2:
  2454 + version "2.3.3"
  2455 + resolved "http://npm.yohops.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
2524 dependencies: 2456 dependencies:
2525 asynckit "^0.4.0" 2457 asynckit "^0.4.0"
2526 - combined-stream "1.0.6" 2458 + combined-stream "^1.0.6"
2527 mime-types "^2.1.12" 2459 mime-types "^2.1.12"
2528 2460
2529 forwarded@~0.1.2: 2461 forwarded@~0.1.2:
@@ -2711,13 +2643,6 @@ har-schema@^2.0.0: @@ -2711,13 +2643,6 @@ har-schema@^2.0.0:
2711 version "2.0.0" 2643 version "2.0.0"
2712 resolved "http://npm.yohops.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" 2644 resolved "http://npm.yohops.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
2713 2645
2714 -har-validator@~5.0.3:  
2715 - version "5.0.3"  
2716 - resolved "http://npm.yohops.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"  
2717 - dependencies:  
2718 - ajv "^5.1.0"  
2719 - har-schema "^2.0.0"  
2720 -  
2721 har-validator@~5.1.0: 2646 har-validator@~5.1.0:
2722 version "5.1.0" 2647 version "5.1.0"
2723 resolved "http://npm.yohops.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29" 2648 resolved "http://npm.yohops.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -2893,15 +2818,6 @@ http-deceiver@^1.2.7: @@ -2893,15 +2818,6 @@ http-deceiver@^1.2.7:
2893 version "1.2.7" 2818 version "1.2.7"
2894 resolved "http://npm.yohops.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" 2819 resolved "http://npm.yohops.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
2895 2820
2896 -http-errors@1.6.2:  
2897 - version "1.6.2"  
2898 - resolved "http://npm.yohops.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"  
2899 - dependencies:  
2900 - depd "1.1.1"  
2901 - inherits "2.0.3"  
2902 - setprototypeof "1.0.3"  
2903 - statuses ">= 1.3.1 < 2"  
2904 -  
2905 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: 2821 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
2906 version "1.6.3" 2822 version "1.6.3"
2907 resolved "http://npm.yohops.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" 2823 resolved "http://npm.yohops.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -2944,10 +2860,6 @@ https-browserify@^1.0.0: @@ -2944,10 +2860,6 @@ https-browserify@^1.0.0:
2944 version "1.0.0" 2860 version "1.0.0"
2945 resolved "http://npm.yohops.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" 2861 resolved "http://npm.yohops.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
2946 2862
2947 -iconv-lite@0.4.19:  
2948 - version "0.4.19"  
2949 - resolved "http://npm.yohops.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"  
2950 -  
2951 iconv-lite@0.4.23: 2863 iconv-lite@0.4.23:
2952 version "0.4.23" 2864 version "0.4.23"
2953 resolved "http://npm.yohops.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" 2865 resolved "http://npm.yohops.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -3674,15 +3586,15 @@ miller-rabin@^4.0.0: @@ -3674,15 +3586,15 @@ miller-rabin@^4.0.0:
3674 bn.js "^4.0.0" 3586 bn.js "^4.0.0"
3675 brorand "^1.0.1" 3587 brorand "^1.0.1"
3676 3588
3677 -"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:  
3678 - version "1.36.0"  
3679 - resolved "http://npm.yohops.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397" 3589 +"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
  3590 + version "1.37.0"
  3591 + resolved "http://npm.yohops.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
3680 3592
3681 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19: 3593 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
3682 - version "2.1.20"  
3683 - resolved "http://npm.yohops.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19" 3594 + version "2.1.21"
  3595 + resolved "http://npm.yohops.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
3684 dependencies: 3596 dependencies:
3685 - mime-db "~1.36.0" 3597 + mime-db "~1.37.0"
3686 3598
3687 mime@1.4.1: 3599 mime@1.4.1:
3688 version "1.4.1" 3600 version "1.4.1"
@@ -3697,8 +3609,8 @@ mimic-fn@^1.0.0: @@ -3697,8 +3609,8 @@ mimic-fn@^1.0.0:
3697 resolved "http://npm.yohops.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" 3609 resolved "http://npm.yohops.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
3698 3610
3699 mini-css-extract-plugin@^0.4.3: 3611 mini-css-extract-plugin@^0.4.3:
3700 - version "0.4.3"  
3701 - resolved "http://npm.yohops.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8" 3612 + version "0.4.4"
  3613 + resolved "http://npm.yohops.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
3702 dependencies: 3614 dependencies:
3703 loader-utils "^1.1.0" 3615 loader-utils "^1.1.0"
3704 schema-utils "^1.0.0" 3616 schema-utils "^1.0.0"
@@ -3734,8 +3646,8 @@ minipass@^2.2.1, minipass@^2.3.3: @@ -3734,8 +3646,8 @@ minipass@^2.2.1, minipass@^2.3.3:
3734 yallist "^3.0.0" 3646 yallist "^3.0.0"
3735 3647
3736 minizlib@^1.1.0: 3648 minizlib@^1.1.0:
3737 - version "1.1.0"  
3738 - resolved "http://npm.yohops.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" 3649 + version "1.1.1"
  3650 + resolved "http://npm.yohops.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
3739 dependencies: 3651 dependencies:
3740 minipass "^2.2.1" 3652 minipass "^2.2.1"
3741 3653
@@ -3847,8 +3759,8 @@ negotiator@0.6.1: @@ -3847,8 +3759,8 @@ negotiator@0.6.1:
3847 resolved "http://npm.yohops.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" 3759 resolved "http://npm.yohops.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
3848 3760
3849 neo-async@^2.5.0: 3761 neo-async@^2.5.0:
3850 - version "2.5.2"  
3851 - resolved "http://npm.yohops.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc" 3762 + version "2.6.0"
  3763 + resolved "http://npm.yohops.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
3852 3764
3853 nice-try@^1.0.4: 3765 nice-try@^1.0.4:
3854 version "1.0.5" 3766 version "1.0.5"
@@ -3928,15 +3840,15 @@ node-pre-gyp@^0.10.0: @@ -3928,15 +3840,15 @@ node-pre-gyp@^0.10.0:
3928 semver "^5.3.0" 3840 semver "^5.3.0"
3929 tar "^4" 3841 tar "^4"
3930 3842
3931 -node-releases@^1.0.0-alpha.12:  
3932 - version "1.0.0-alpha.12"  
3933 - resolved "http://npm.yohops.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268" 3843 +node-releases@^1.0.0-alpha.14:
  3844 + version "1.0.0-alpha.14"
  3845 + resolved "http://npm.yohops.com/node-releases/-/node-releases-1.0.0-alpha.14.tgz#da9e2780add4bbb59ad890af9e2018a1d9c0034b"
3934 dependencies: 3846 dependencies:
3935 semver "^5.3.0" 3847 semver "^5.3.0"
3936 3848
3937 node-sass@^4.9.3: 3849 node-sass@^4.9.3:
3938 - version "4.9.3"  
3939 - resolved "http://npm.yohops.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224" 3850 + version "4.9.4"
  3851 + resolved "http://npm.yohops.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
3940 dependencies: 3852 dependencies:
3941 async-foreach "^0.1.3" 3853 async-foreach "^0.1.3"
3942 chalk "^1.1.1" 3854 chalk "^1.1.1"
@@ -3953,7 +3865,7 @@ node-sass@^4.9.3: @@ -3953,7 +3865,7 @@ node-sass@^4.9.3:
3953 nan "^2.10.0" 3865 nan "^2.10.0"
3954 node-gyp "^3.8.0" 3866 node-gyp "^3.8.0"
3955 npmlog "^4.0.0" 3867 npmlog "^4.0.0"
3956 - request "2.87.0" 3868 + request "^2.88.0"
3957 sass-graph "^2.2.4" 3869 sass-graph "^2.2.4"
3958 stdout-stream "^1.4.0" 3870 stdout-stream "^1.4.0"
3959 "true-case-path" "^1.0.2" 3871 "true-case-path" "^1.0.2"
@@ -4039,10 +3951,6 @@ number-is-nan@^1.0.0: @@ -4039,10 +3951,6 @@ number-is-nan@^1.0.0:
4039 version "1.0.1" 3951 version "1.0.1"
4040 resolved "http://npm.yohops.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" 3952 resolved "http://npm.yohops.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
4041 3953
4042 -oauth-sign@~0.8.2:  
4043 - version "0.8.2"  
4044 - resolved "http://npm.yohops.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"  
4045 -  
4046 oauth-sign@~0.9.0: 3954 oauth-sign@~0.9.0:
4047 version "0.9.0" 3955 version "0.9.0"
4048 resolved "http://npm.yohops.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" 3956 resolved "http://npm.yohops.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -4375,8 +4283,8 @@ pkg-dir@^3.0.0: @@ -4375,8 +4283,8 @@ pkg-dir@^3.0.0:
4375 find-up "^3.0.0" 4283 find-up "^3.0.0"
4376 4284
4377 portfinder@^1.0.9: 4285 portfinder@^1.0.9:
4378 - version "1.0.17"  
4379 - resolved "http://npm.yohops.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a" 4286 + version "1.0.18"
  4287 + resolved "http://npm.yohops.com/portfinder/-/portfinder-1.0.18.tgz#cf1106ff336fd4329b7ce32fda7d17d62c6bcf37"
4380 dependencies: 4288 dependencies:
4381 async "^1.5.2" 4289 async "^1.5.2"
4382 debug "^2.2.0" 4290 debug "^2.2.0"
@@ -4634,9 +4542,9 @@ postcss-unique-selectors@^2.0.2: @@ -4634,9 +4542,9 @@ postcss-unique-selectors@^2.0.2:
4634 postcss "^5.0.4" 4542 postcss "^5.0.4"
4635 uniqs "^2.0.0" 4543 uniqs "^2.0.0"
4636 4544
4637 -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:  
4638 - version "3.3.0"  
4639 - resolved "http://npm.yohops.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" 4545 +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:
  4546 + version "3.3.1"
  4547 + resolved "http://npm.yohops.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
4640 4548
4641 postcss-zindex@^2.0.1: 4549 postcss-zindex@^2.0.1:
4642 version "2.2.0" 4550 version "2.2.0"
@@ -4663,7 +4571,7 @@ postcss@^6.0.1: @@ -4663,7 +4571,7 @@ postcss@^6.0.1:
4663 source-map "^0.6.1" 4571 source-map "^0.6.1"
4664 supports-color "^5.4.0" 4572 supports-color "^5.4.0"
4665 4573
4666 -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2: 4574 +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
4667 version "7.0.5" 4575 version "7.0.5"
4668 resolved "http://npm.yohops.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55" 4576 resolved "http://npm.yohops.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
4669 dependencies: 4577 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: @@ -4705,7 +4613,7 @@ prop-types@^15.5.0, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2:
4705 loose-envify "^1.3.1" 4613 loose-envify "^1.3.1"
4706 object-assign "^4.1.1" 4614 object-assign "^4.1.1"
4707 4615
4708 -proxy-addr@~2.0.3, proxy-addr@~2.0.4: 4616 +proxy-addr@~2.0.4:
4709 version "2.0.4" 4617 version "2.0.4"
4710 resolved "http://npm.yohops.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" 4618 resolved "http://npm.yohops.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
4711 dependencies: 4619 dependencies:
@@ -4766,11 +4674,7 @@ q@^1.1.2: @@ -4766,11 +4674,7 @@ q@^1.1.2:
4766 version "1.5.1" 4674 version "1.5.1"
4767 resolved "http://npm.yohops.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" 4675 resolved "http://npm.yohops.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
4768 4676
4769 -qs@6.5.1:  
4770 - version "6.5.1"  
4771 - resolved "http://npm.yohops.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"  
4772 -  
4773 -qs@6.5.2, qs@~6.5.1, qs@~6.5.2: 4677 +qs@6.5.2, qs@~6.5.2:
4774 version "6.5.2" 4678 version "6.5.2"
4775 resolved "http://npm.yohops.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" 4679 resolved "http://npm.yohops.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
4776 4680
@@ -4798,8 +4702,8 @@ querystring@0.2.0: @@ -4798,8 +4702,8 @@ querystring@0.2.0:
4798 resolved "http://npm.yohops.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" 4702 resolved "http://npm.yohops.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
4799 4703
4800 querystringify@^2.0.0: 4704 querystringify@^2.0.0:
4801 - version "2.0.0"  
4802 - resolved "http://npm.yohops.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755" 4705 + version "2.1.0"
  4706 + resolved "http://npm.yohops.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
4803 4707
4804 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: 4708 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
4805 version "2.0.6" 4709 version "2.0.6"
@@ -4818,15 +4722,6 @@ range-parser@^1.0.3, range-parser@~1.2.0: @@ -4818,15 +4722,6 @@ range-parser@^1.0.3, range-parser@~1.2.0:
4818 version "1.2.0" 4722 version "1.2.0"
4819 resolved "http://npm.yohops.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" 4723 resolved "http://npm.yohops.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
4820 4724
4821 -raw-body@2.3.2:  
4822 - version "2.3.2"  
4823 - resolved "http://npm.yohops.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"  
4824 - dependencies:  
4825 - bytes "3.0.0"  
4826 - http-errors "1.6.2"  
4827 - iconv-lite "0.4.19"  
4828 - unpipe "1.0.0"  
4829 -  
4830 raw-body@2.3.3: 4725 raw-body@2.3.3:
4831 version "2.3.3" 4726 version "2.3.3"
4832 resolved "http://npm.yohops.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" 4727 resolved "http://npm.yohops.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -5104,32 +4999,7 @@ repeating@^2.0.0: @@ -5104,32 +4999,7 @@ repeating@^2.0.0:
5104 dependencies: 4999 dependencies:
5105 is-finite "^1.0.0" 5000 is-finite "^1.0.0"
5106 5001
5107 -request@2.87.0:  
5108 - version "2.87.0"  
5109 - resolved "http://npm.yohops.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"  
5110 - dependencies:  
5111 - aws-sign2 "~0.7.0"  
5112 - aws4 "^1.6.0"  
5113 - caseless "~0.12.0"  
5114 - combined-stream "~1.0.5"  
5115 - extend "~3.0.1"  
5116 - forever-agent "~0.6.1"  
5117 - form-data "~2.3.1"  
5118 - har-validator "~5.0.3"  
5119 - http-signature "~1.2.0"  
5120 - is-typedarray "~1.0.0"  
5121 - isstream "~0.1.2"  
5122 - json-stringify-safe "~5.0.1"  
5123 - mime-types "~2.1.17"  
5124 - oauth-sign "~0.8.2"  
5125 - performance-now "^2.1.0"  
5126 - qs "~6.5.1"  
5127 - safe-buffer "^5.1.1"  
5128 - tough-cookie "~2.3.3"  
5129 - tunnel-agent "^0.6.0"  
5130 - uuid "^3.1.0"  
5131 -  
5132 -request@^2.87.0: 5002 +request@^2.87.0, request@^2.88.0:
5133 version "2.88.0" 5003 version "2.88.0"
5134 resolved "http://npm.yohops.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" 5004 resolved "http://npm.yohops.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
5135 dependencies: 5005 dependencies:
@@ -5221,10 +5091,6 @@ run-queue@^1.0.0, run-queue@^1.0.3: @@ -5221,10 +5091,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
5221 dependencies: 5091 dependencies:
5222 aproba "^1.1.1" 5092 aproba "^1.1.1"
5223 5093
5224 -safe-buffer@5.1.1:  
5225 - version "5.1.1"  
5226 - resolved "http://npm.yohops.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"  
5227 -  
5228 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: 5094 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:
5229 version "5.1.2" 5095 version "5.1.2"
5230 resolved "http://npm.yohops.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" 5096 resolved "http://npm.yohops.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -5302,16 +5168,12 @@ select-hose@^2.0.0: @@ -5302,16 +5168,12 @@ select-hose@^2.0.0:
5302 resolved "http://npm.yohops.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" 5168 resolved "http://npm.yohops.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
5303 5169
5304 selfsigned@^1.9.1: 5170 selfsigned@^1.9.1:
5305 - version "1.10.3"  
5306 - resolved "http://npm.yohops.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823" 5171 + version "1.10.4"
  5172 + resolved "http://npm.yohops.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
5307 dependencies: 5173 dependencies:
5308 node-forge "0.7.5" 5174 node-forge "0.7.5"
5309 5175
5310 -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:  
5311 - version "5.5.1"  
5312 - resolved "http://npm.yohops.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"  
5313 -  
5314 -semver@^5.4.1, semver@^5.5.1: 5176 +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
5315 version "5.6.0" 5177 version "5.6.0"
5316 resolved "http://npm.yohops.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" 5178 resolved "http://npm.yohops.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
5317 5179
@@ -5388,10 +5250,6 @@ setimmediate@^1.0.4: @@ -5388,10 +5250,6 @@ setimmediate@^1.0.4:
5388 version "1.0.5" 5250 version "1.0.5"
5389 resolved "http://npm.yohops.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" 5251 resolved "http://npm.yohops.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
5390 5252
5391 -setprototypeof@1.0.3:  
5392 - version "1.0.3"  
5393 - resolved "http://npm.yohops.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"  
5394 -  
5395 setprototypeof@1.1.0: 5253 setprototypeof@1.1.0:
5396 version "1.1.0" 5254 version "1.1.0"
5397 resolved "http://npm.yohops.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" 5255 resolved "http://npm.yohops.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -5481,8 +5339,8 @@ sort-keys@^1.0.0: @@ -5481,8 +5339,8 @@ sort-keys@^1.0.0:
5481 is-plain-obj "^1.0.0" 5339 is-plain-obj "^1.0.0"
5482 5340
5483 source-list-map@^2.0.0: 5341 source-list-map@^2.0.0:
5484 - version "2.0.0"  
5485 - resolved "http://npm.yohops.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" 5342 + version "2.0.1"
  5343 + resolved "http://npm.yohops.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
5486 5344
5487 source-map-resolve@^0.5.0: 5345 source-map-resolve@^0.5.0:
5488 version "0.5.2" 5346 version "0.5.2"
@@ -5575,18 +5433,17 @@ sprintf-js@~1.0.2: @@ -5575,18 +5433,17 @@ sprintf-js@~1.0.2:
5575 resolved "http://npm.yohops.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" 5433 resolved "http://npm.yohops.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
5576 5434
5577 sshpk@^1.7.0: 5435 sshpk@^1.7.0:
5578 - version "1.14.2"  
5579 - resolved "http://npm.yohops.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" 5436 + version "1.15.1"
  5437 + resolved "http://npm.yohops.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
5580 dependencies: 5438 dependencies:
5581 asn1 "~0.2.3" 5439 asn1 "~0.2.3"
5582 assert-plus "^1.0.0" 5440 assert-plus "^1.0.0"
5583 - dashdash "^1.12.0"  
5584 - getpass "^0.1.1"  
5585 - safer-buffer "^2.0.2"  
5586 - optionalDependencies:  
5587 bcrypt-pbkdf "^1.0.0" 5441 bcrypt-pbkdf "^1.0.0"
  5442 + dashdash "^1.12.0"
5588 ecc-jsbn "~0.1.1" 5443 ecc-jsbn "~0.1.1"
  5444 + getpass "^0.1.1"
5589 jsbn "~0.1.0" 5445 jsbn "~0.1.0"
  5446 + safer-buffer "^2.0.2"
5590 tweetnacl "~0.14.0" 5447 tweetnacl "~0.14.0"
5591 5448
5592 ssri@^5.2.4: 5449 ssri@^5.2.4:
@@ -5602,7 +5459,7 @@ static-extend@^0.1.1: @@ -5602,7 +5459,7 @@ static-extend@^0.1.1:
5602 define-property "^0.2.5" 5459 define-property "^0.2.5"
5603 object-copy "^0.1.0" 5460 object-copy "^0.1.0"
5604 5461
5605 -"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2": 5462 +"statuses@>= 1.4.0 < 2":
5606 version "1.5.0" 5463 version "1.5.0"
5607 resolved "http://npm.yohops.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" 5464 resolved "http://npm.yohops.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
5608 5465
@@ -5776,8 +5633,8 @@ through2@^2.0.0: @@ -5776,8 +5633,8 @@ through2@^2.0.0:
5776 xtend "~4.0.1" 5633 xtend "~4.0.1"
5777 5634
5778 thunky@^1.0.2: 5635 thunky@^1.0.2:
5779 - version "1.0.2"  
5780 - resolved "http://npm.yohops.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371" 5636 + version "1.0.3"
  5637 + resolved "http://npm.yohops.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
5781 5638
5782 timers-browserify@^2.0.4: 5639 timers-browserify@^2.0.4:
5783 version "2.0.10" 5640 version "2.0.10"
@@ -5819,12 +5676,6 @@ toposort@^1.0.0: @@ -5819,12 +5676,6 @@ toposort@^1.0.0:
5819 version "1.0.7" 5676 version "1.0.7"
5820 resolved "http://npm.yohops.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" 5677 resolved "http://npm.yohops.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
5821 5678
5822 -tough-cookie@~2.3.3:  
5823 - version "2.3.4"  
5824 - resolved "http://npm.yohops.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"  
5825 - dependencies:  
5826 - punycode "^1.4.1"  
5827 -  
5828 tough-cookie@~2.4.3: 5679 tough-cookie@~2.4.3:
5829 version "2.4.3" 5680 version "2.4.3"
5830 resolved "http://npm.yohops.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" 5681 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: @@ -5868,7 +5719,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
5868 version "0.14.5" 5719 version "0.14.5"
5869 resolved "http://npm.yohops.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" 5720 resolved "http://npm.yohops.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
5870 5721
5871 -type-is@~1.6.15, type-is@~1.6.16: 5722 +type-is@~1.6.16:
5872 version "1.6.16" 5723 version "1.6.16"
5873 resolved "http://npm.yohops.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" 5724 resolved "http://npm.yohops.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
5874 dependencies: 5725 dependencies:
@@ -5984,8 +5835,8 @@ urix@^0.1.0: @@ -5984,8 +5835,8 @@ urix@^0.1.0:
5984 resolved "http://npm.yohops.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" 5835 resolved "http://npm.yohops.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
5985 5836
5986 url-loader@^1.0.1: 5837 url-loader@^1.0.1:
5987 - version "1.1.1"  
5988 - resolved "http://npm.yohops.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1" 5838 + version "1.1.2"
  5839 + resolved "http://npm.yohops.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
5989 dependencies: 5840 dependencies:
5990 loader-utils "^1.1.0" 5841 loader-utils "^1.1.0"
5991 mime "^2.0.3" 5842 mime "^2.0.3"
@@ -6040,7 +5891,7 @@ utils-merge@1.0.1: @@ -6040,7 +5891,7 @@ utils-merge@1.0.1:
6040 version "1.0.1" 5891 version "1.0.1"
6041 resolved "http://npm.yohops.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" 5892 resolved "http://npm.yohops.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
6042 5893
6043 -uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: 5894 +uuid@^3.0.1, uuid@^3.3.2:
6044 version "3.3.2" 5895 version "3.3.2"
6045 resolved "http://npm.yohops.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" 5896 resolved "http://npm.yohops.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
6046 5897
@@ -6202,8 +6053,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0: @@ -6202,8 +6053,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
6202 source-map "~0.6.1" 6053 source-map "~0.6.1"
6203 6054
6204 webpack@^4.17.2: 6055 webpack@^4.17.2:
6205 - version "4.20.2"  
6206 - resolved "http://npm.yohops.com/webpack/-/webpack-4.20.2.tgz#89f6486b6bb276a91b0823453d377501fc625b5a" 6056 + version "4.21.0"
  6057 + resolved "http://npm.yohops.com/webpack/-/webpack-4.21.0.tgz#bd03605c0f48c0d4aaaef78ead2769485e5afd92"
6207 dependencies: 6058 dependencies:
6208 "@webassemblyjs/ast" "1.7.8" 6059 "@webassemblyjs/ast" "1.7.8"
6209 "@webassemblyjs/helper-module-context" "1.7.8" 6060 "@webassemblyjs/helper-module-context" "1.7.8"
@@ -6367,6 +6218,6 @@ yargs@^7.0.0: @@ -6367,6 +6218,6 @@ yargs@^7.0.0:
6367 y18n "^3.2.1" 6218 y18n "^3.2.1"
6368 yargs-parser "^5.0.0" 6219 yargs-parser "^5.0.0"
6369 6220
6370 -yoho-activity-sdk@1.0.7:  
6371 - version "1.0.7"  
6372 - resolved "http://npm.yohops.com/yoho-activity-sdk/-/yoho-activity-sdk-1.0.7.tgz#c7a7f28b0f80a783a1dac3e8bde08b4d99e2b2a6" 6221 +yoho-activity-sdk@1.0.8:
  6222 + version "1.0.8"
  6223 + resolved "http://npm.yohops.com/yoho-activity-sdk/-/yoho-activity-sdk-1.0.8.tgz#e78bb0dbf25c22e97dd6aa283e1e4fc27659c154"