Skip to content

M
mr-julyedu
Commit 8b5b79c6 by xuzhenghua
Options

合并master

parent c2b00593
Showing with 549 additions and 500 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="60bc3527-5f9e-436f-8ed9-968e6eddd66e" name="Default Changelist" comment="" />
<list default="true" id="60bc3527-5f9e-436f-8ed9-968e6eddd66e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/common/Courseload/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/common/Courseload/listview.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/classify/courselist.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/classify/courselist.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/node_modules/" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -13,11 +24,70 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/common/Courseload/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="6" column="14" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/common/Courseload/listview.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="48" column="28" selection-start-line="48" selection-start-column="28" selection-end-line="48" selection-end-column="28" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="e#154#1571#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>vip</find>
<find>class</find>
<find>classify</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/node_modules/less-loader/dist/index.js" />
<option value="$PROJECT_DIR$/src/components/classify/index.js" />
<option value="$PROJECT_DIR$/src/components/classify/index.scss" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.scss" />
<option value="$PROJECT_DIR$/src/common/ListView/listview.scss" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/common/index.js" />
<option value="$PROJECT_DIR$/src/common/ListView/index.js" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.js" />
<option value="$PROJECT_DIR$/src/common/Courseload/index.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" fullScreen="true">
<option name="width" value="1440" />
<option name="height" value="900" />
......@@ -27,8 +97,56 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="Course" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="classify" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="Index" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="ProjectPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -41,6 +159,12 @@
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="yarn" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/common" />
<recent name="$PROJECT_DIR$/src/components/classify" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
......@@ -64,16 +188,18 @@
<option name="presentableId" value="Default" />
<updated>1555481508116</updated>
<workItem from="1555481509516" duration="544000" />
<workItem from="1555900140776" duration="4317000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="583000" />
<option name="totallyTimeSpent" value="4904000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="6" />
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16913319" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16420014" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
......@@ -99,17 +225,144 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/common/Tabbar/index.js" />
<entry file="file://$PROJECT_DIR$/src/main.js" />
<entry file="file://$PROJECT_DIR$/src/components/Index/index.js">
<entry file="file://$PROJECT_DIR$/node_modules/less-loader/dist/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/styles/variable.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="36" column="20" lean-forward="true" selection-start-line="36" selection-end-line="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="119" selection-start-line="119" selection-end-line="131" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="65" column="21" lean-forward="true" selection-start-line="65" selection-start-column="21" selection-end-line="65" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/paths.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1212" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-204" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/start.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/scripts/test.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/scripts/build.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2293" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Nav/NavLink/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="4" column="49" lean-forward="true" selection-start-line="4" selection-end-line="5" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="147">
<caret line="7" column="30" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/index.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="6" selection-start-column="6" selection-end-column="6" />
<caret column="7" lean-forward="true" selection-start-column="7" selection-end-column="7" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="n#!!block;n#render#0;n#Classify#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="71" column="28" lean-forward="true" selection-start-line="71" selection-end-line="72" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="e#193#1642#0" />
<element signature="e#1661#2535#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="48" column="28" selection-start-line="48" selection-start-column="28" selection-end-line="48" selection-end-column="28" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="e#154#1571#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Courseload/listview.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Course/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" column="16" lean-forward="true" selection-end-line="18" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Courseload/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="6" column="14" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
src/common/Courseload/index.js 0 → 100644
import React from 'react';
import './course.scss'
const Course = (props) => {
return (
<li className='course-item'>
wwwww
</li>
);
};
export default Course;
src/common/index.js
......@@ -5,3 +5,4 @@ export { default as Course } from './Course' // 课程状态（试听 正在
export { default as Carousel } from './Carousel' // 横向滚动
export { default as Topscroll } from './Topscroll' // 首页头部轮播
export { default as Scroll } from './Scroll' // 首页正常轮播图
export { default as Courseload } from './Courseload' // 下拉加载课程列表
src/components/classify/courselist.js 0 → 100644
import React, {Component} from 'react';
import {Courseload} from '../../common';
import './index.scss';
class Classify extends Component {
state = {
dataList: [
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': 'Spark大数据',
'teacher': 'wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': '机器学习',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': 'Linux',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': '数学',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 1,
'price0': 200,
'price1': 2000
}
]
}
render() {
return (
<div className='class-box'>
<Courseload></Courseload>
</div>
)
}
}
export default Classify;
\ No newline at end of file
src/components/classify/index.js
import React, { Component } from 'react';
import React, {Component} from 'react';
import './index.scss';
class Classify extends Component {
state = {
dataList: [
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': 'Spark大数据',
'teacher': 'wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': '机器学习',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': 'Linux',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 0,
'price0': 100,
'price1': 1000
},
{
'src': 'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png',
'title': '数学',
'teacher': 'wwwwww',
'time': '2343234',
'isbuy': 1,
'price0': 200,
'price1': 2000
}
]
}
render() {
return(
return (
<div className='class-box'>
<div className="class-title">分类</div>
<div className="class-course">
<p className='course-items-title'><img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt=""/>集训营</p>
<div className='items-box'>
{
this.state.dataList.map((item,index)=>{
return (
<a href="#" key={index} className='item-banner'><img
src={item.src}
alt=""/></a>
)
})
}
</div>
</div>
<div className="class-course">
<p className='course-items-title'><img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt=""/>就业班</p>
<div className='items-box'>
{
this.state.dataList.map((item,index)=>{
return (
<a href="#" key={index} className='item-banner'><img
src={item.src}
alt=""/></a>
)
})
}
</div>
</div>
<div className="class-course">
<p className='course-items-title'><img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt=""/>基础入门</p>
<div className='items-box'>
{
this.state.dataList.map((item,index)=>{
return (
<a href="#" key={index} className='item-label'>{item.title}</a>
)
})
}
</div>
</div>
<div className="class-course">
<p className='course-items-title'><img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt=""/>进阶提高</p>
<div className='items-box'>
{
this.state.dataList.map((item,index)=>{
return (
<a href="#" key={index} className='item-label'>{item.title}</a>
)
})
}
</div>
</div>
<div className="vip">
<a href="/#">
<img src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png" alt=""/>
</a>
</div>
</div>
)
}
......
src/components/classify/index.scss
.class-box {
background-color: $bg_fff;
}
.class-title {
width: 100%;
height: 44px;
line-height: 44px;
text-align: center;
background-color: #F7F9FC;
font-size: 16px;
color: $color_333;
}
.class-course {
width: 100%;
margin-top: 20px;
padding: 0 15px;
.course-items-title {
font-size: 13px;
color: $color_333;
img {
margin-right: 8px;
width: 10px;
height: 11px;
}
}
.items-box {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.item-banner {
display: inline-block;
width: 30.5%;
height: 76px;
margin-top: 10px;
img {
width: 100%;
height: 100%;
border-radius: 3px;
}
}
.item-label {
display: inline-block;
width: 30.5%;
height: 30px;
line-height: 30px;
text-align: center;
background-color: $bg_f4f4f4;
border-radius: 15px;
margin-top: 15px;
margin-bottom: -5px;
}
}
}
.vip {
width: 100%;
height: 130px;
border-radius: 5px;
margin-top: 20px;
margin-bottom: 50px;
padding: 0 15px;
img {
width: 100%;
height: 106px;
border-radius: 5px;
}
}
src/router.js
......@@ -6,6 +6,7 @@ import Index from './components/Index';
import Classify from './components/classify';
import Study from './components/study';
import My from './components/my';
import CourseList from './components/classify/courselist';
......@@ -18,6 +19,7 @@ const router = () => (
<Route path='/classify' component={Classify}></Route>
<Route path='/study' component={Study}></Route>
<Route path='/my' component={My}></Route>
<Route path='/courselist' component={CourseList}></Route>
</Switch>
<Menu />
</Router>
......
yarn.lock
......@@ -1011,9 +1011,9 @@
loader-utils "^1.1.0"
"@types/node@*":
version "11.13.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
version "11.13.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.6.tgz#37ec75690830acb0d74ce3c6c43caab787081e85"
integrity sha512-Xoo/EBzEe8HxTSwaZNLZjaW6M6tA/+GmD3/DZ6uo8qSaolE/9Oarko0oV1fVfrLqOz0tx0nXJB4rdD5c+vixLw==
"@types/q@^1.5.1":
version "1.5.2"
......@@ -1226,9 +1226,9 @@ acorn-dynamic-import@^3.0.0:
acorn "^5.0.0"
acorn-globals@^4.1.0:
version "4.3.1"
resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.1.tgz#deb149c59276657ebd40ba2ba849ddd529763ccf"
integrity sha512-gJSiKY8dBIjV/0jagZIFBdVMtfQyA5QHCvAT48H2q8REQoW8Fs5AOjqBql1LgSXgrMWdevcE+8cdZ33NtVbIBA==
version "4.3.2"
resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
dependencies:
acorn "^6.0.1"
acorn-walk "^6.0.1"
......@@ -1290,20 +1290,11 @@ alphanum-sort@^1.0.0:
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
ansi-colors@^3.0.0:
version "3.2.4"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
......@@ -1450,20 +1441,11 @@ array-filter@~0.0.0:
resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
array-find-index@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
array-flatten@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
......@@ -1577,20 +1559,11 @@ async-each@^1.0.1:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
async-foreach@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
async-limiter@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
......@@ -1968,11 +1941,6 @@ binary-extensions@^1.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
block-stream@*:
version "0.0.9"
resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
......@@ -1980,10 +1948,6 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
bluebird@^3.5.1, bluebird@^3.5.3:
version "3.5.4"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
......@@ -2267,11 +2231,6 @@ camel-case@3.0.x:
no-case "^2.2.0"
upper-case "^1.1.1"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
camelcase-keys@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
......@@ -2290,10 +2249,6 @@ camelcase@^3.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
......@@ -2315,9 +2270,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000918, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960:
version "1.0.30000960"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
version "1.0.30000962"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz#6c10c3ab304b89bea905e66adf98c0905088ee44"
integrity sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==
capture-exit@^1.2.0:
version "1.2.0"
......@@ -2350,15 +2305,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
<<<<<<< HEAD
<<<<<<< HEAD
chalk@^1.1.3:
=======
chalk@^1.1.1, chalk@^1.1.3:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
chalk@^1.1.1, chalk@^1.1.3:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
......@@ -2462,11 +2409,6 @@ cli-width@^2.0.0:
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
cliui@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
......@@ -2476,10 +2418,6 @@ cliui@^3.2.0:
strip-ansi "^3.0.1"
wrap-ansi "^2.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
cliui@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
......@@ -2859,11 +2797,6 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
cross-spawn@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
......@@ -2872,10 +2805,6 @@ cross-spawn@^3.0.0:
lru-cache "^4.0.1"
which "^1.2.9"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
......@@ -3130,11 +3059,6 @@ cssstyle@^1.0.0:
dependencies:
cssom "0.3.x"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
currently-unhandled@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
......@@ -3142,10 +3066,6 @@ currently-unhandled@^0.4.1:
dependencies:
array-find-index "^1.0.1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
cyclist@~0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
......@@ -3198,15 +3118,7 @@ debug@^4.0.1, debug@^4.1.0:
dependencies:
ms "^2.1.1"
<<<<<<< HEAD
<<<<<<< HEAD
decamelize@^1.1.1:
=======
decamelize@^1.1.1, decamelize@^1.1.2:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
decamelize@^1.1.1, decamelize@^1.1.2:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
......@@ -3515,9 +3427,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.124:
version "1.3.124"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
version "1.3.125"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz#dbde0e95e64ebe322db0eca764d951f885a5aff2"
integrity sha512-XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A==
elliptic@^6.0.0:
version "6.4.1"
......@@ -4394,11 +4306,6 @@ fsevents@^1.2.3, fsevents@^1.2.7:
nan "^2.12.1"
node-pre-gyp "^0.12.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
fstream@^1.0.0, fstream@^1.0.2:
version "1.0.11"
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
......@@ -4409,10 +4316,6 @@ fstream@^1.0.0, fstream@^1.0.2:
mkdirp ">=0.5 0"
rimraf "2"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
......@@ -4437,11 +4340,6 @@ gauge@~2.7.3:
strip-ansi "^3.0.1"
wide-align "^1.1.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
gaze@^1.0.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
......@@ -4449,10 +4347,6 @@ gaze@^1.0.0:
dependencies:
globule "^1.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
get-caller-file@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
......@@ -4463,20 +4357,11 @@ get-own-enumerable-property-symbols@^3.0.0:
resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
......@@ -4529,15 +4414,7 @@ glob-to-regexp@^0.3.0:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
<<<<<<< HEAD
<<<<<<< HEAD
glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
=======
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "7.1.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
......@@ -4599,11 +4476,6 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
globule@^1.0.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
......@@ -4613,10 +4485,6 @@ globule@^1.0.0:
lodash "~4.17.10"
minimatch "~3.0.2"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
version "4.1.15"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
......@@ -5091,11 +4959,6 @@ imurmurhash@^0.1.4:
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
in-publish@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
......@@ -5108,10 +4971,6 @@ indent-string@^2.1.0:
dependencies:
repeating "^2.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
indexes-of@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
......@@ -5130,15 +4989,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
<<<<<<< HEAD
<<<<<<< HEAD
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
=======
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
......@@ -6013,20 +5864,11 @@ joi@^11.1.1:
isemail "3.x.x"
topo "2.x.x"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
js-base64@^2.1.8:
version "2.5.1"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
js-levenshtein@^1.1.3:
version "1.1.6"
resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
......@@ -6181,9 +6023,9 @@ jsprim@^1.2.2:
verror "1.10.0"
jsx-ast-utils@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
version "2.1.0"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36"
integrity sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA==
dependencies:
array-includes "^3.0.3"
......@@ -6372,39 +6214,21 @@ lodash._reinterpolate@~3.0.0:
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.camelcase@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.isarguments@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
......@@ -6429,20 +6253,11 @@ lodash.memoize@^4.1.2:
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lodash.sortby@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
......@@ -6473,15 +6288,7 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
<<<<<<< HEAD
<<<<<<< HEAD
"lodash@>=3.5 <5", lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
=======
"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
......@@ -6498,11 +6305,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
dependencies:
js-tokens "^3.0.0 || ^4.0.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
loud-rejection@^1.0.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
......@@ -6511,10 +6313,6 @@ loud-rejection@^1.0.0:
currently-unhandled "^0.4.1"
signal-exit "^3.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
......@@ -6562,20 +6360,11 @@ map-cache@^0.2.2:
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
map-visit@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
......@@ -6631,11 +6420,6 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
errno "^0.1.3"
readable-stream "^2.0.1"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
meow@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
......@@ -6652,10 +6436,6 @@ meow@^3.7.0:
redent "^1.0.0"
trim-newlines "^1.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
merge-deep@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
......@@ -6738,22 +6518,17 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
"mime-db@>= 1.38.0 < 2":
version "1.39.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
mime-db@~1.38.0:
version "1.38.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
mime-db@1.40.0, "mime-db@>= 1.38.0 < 2":
version "1.40.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
version "2.1.22"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
version "2.1.24"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
dependencies:
mime-db "~1.38.0"
mime-db "1.40.0"
mime@1.4.1:
version "1.4.1"
......@@ -6799,15 +6574,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
<<<<<<< HEAD
<<<<<<< HEAD
minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
=======
minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
......@@ -6819,15 +6586,7 @@ minimist@0.0.8:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
<<<<<<< HEAD
<<<<<<< HEAD
minimist@^1.1.1, minimist@^1.2.0:
=======
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
......@@ -6884,15 +6643,7 @@ mixin-object@^2.0.1:
for-in "^0.1.3"
is-extendable "^0.1.1"
<<<<<<< HEAD
<<<<<<< HEAD
mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
=======
mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
......@@ -6939,15 +6690,7 @@ mute-stream@0.0.7:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
<<<<<<< HEAD
<<<<<<< HEAD
nan@^2.12.1:
=======
nan@^2.10.0, nan@^2.12.1:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
nan@^2.10.0, nan@^2.12.1:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "2.13.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
......@@ -7018,11 +6761,6 @@ node-forge@0.7.5:
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
node-gyp@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
......@@ -7041,10 +6779,6 @@ node-gyp@^3.8.0:
tar "^2.0.0"
which "1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
node-int64@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
......@@ -7113,11 +6847,6 @@ node-releases@^1.1.14, node-releases@^1.1.3:
dependencies:
semver "^5.3.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
node-sass@^4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
......@@ -7150,10 +6879,6 @@ node-sass@^4.11.0:
dependencies:
abbrev "1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
nopt@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
......@@ -7162,15 +6887,7 @@ nopt@^4.0.1:
abbrev "1"
osenv "^0.1.4"
<<<<<<< HEAD
<<<<<<< HEAD
normalize-package-data@^2.3.2:
=======
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
......@@ -7227,15 +6944,7 @@ npm-run-path@^2.0.0:
dependencies:
path-key "^2.0.0"
<<<<<<< HEAD
<<<<<<< HEAD
npmlog@^4.0.2:
=======
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
......@@ -7446,11 +7155,6 @@ os-homedir@^1.0.0:
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
os-locale@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
......@@ -7458,10 +7162,6 @@ os-locale@^1.4.0:
dependencies:
lcid "^1.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
os-locale@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
......@@ -7485,15 +7185,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
<<<<<<< HEAD
<<<<<<< HEAD
osenv@^0.1.4:
=======
osenv@0, osenv@^0.1.4:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
osenv@0, osenv@^0.1.4:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "0.1.5"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
......@@ -9018,11 +8710,6 @@ recursive-readdir@2.2.2:
dependencies:
minimatch "3.0.4"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
redent@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
......@@ -9031,10 +8718,6 @@ redent@^1.0.0:
indent-string "^2.1.0"
strip-indent "^1.0.1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
redux@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
......@@ -9215,15 +8898,7 @@ request-promise-native@^1.0.5:
stealthy-require "^1.1.1"
tough-cookie "^2.3.3"
<<<<<<< HEAD
<<<<<<< HEAD
request@^2.83.0, request@^2.87.0:
=======
request@^2.83.0, request@^2.87.0, request@^2.88.0:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
request@^2.83.0, request@^2.87.0, request@^2.88.0:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
......@@ -9331,15 +9006,7 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
<<<<<<< HEAD
<<<<<<< HEAD
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
=======
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
......@@ -9565,11 +9232,6 @@ sane@^2.0.0:
optionalDependencies:
fsevents "^1.2.3"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
sass-graph@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
......@@ -9580,12 +9242,7 @@ sass-graph@^2.2.4:
scss-tokenizer "^0.2.3"
yargs "^7.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
sass-loader@7.1.0:
=======
sass-loader@^7.1.0:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "7.1.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
......@@ -9637,11 +9294,6 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
scss-tokenizer@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
......@@ -9650,10 +9302,6 @@ scss-tokenizer@^0.2.3:
js-base64 "^2.1.8"
source-map "^0.4.2"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
select-hose@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
......@@ -9676,20 +9324,11 @@ semver@^6.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
send@0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
......@@ -9960,11 +9599,6 @@ source-map-url@^0.4.0:
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
source-map@^0.4.2:
version "0.4.4"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
......@@ -9972,10 +9606,6 @@ source-map@^0.4.2:
dependencies:
amdefine ">=0.0.4"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
......@@ -10102,11 +9732,6 @@ statuses@~1.4.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
stdout-stream@^1.4.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
......@@ -10114,10 +9739,6 @@ stdout-stream@^1.4.0:
dependencies:
readable-stream "^2.0.1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
stealthy-require@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
......@@ -10163,15 +9784,7 @@ string-length@^2.0.0:
astral-regex "^1.0.0"
strip-ansi "^4.0.0"
<<<<<<< HEAD
<<<<<<< HEAD
string-width@^1.0.1:
=======
string-width@^1.0.1, string-width@^1.0.2:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
string-width@^1.0.1, string-width@^1.0.2:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
......@@ -10273,11 +9886,6 @@ strip-eof@^1.0.0:
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
strip-indent@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
......@@ -10285,10 +9893,6 @@ strip-indent@^1.0.1:
dependencies:
get-stdin "^4.0.1"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
......@@ -10382,11 +9986,6 @@ tapable@^1.0.0, tapable@^1.1.0:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
tar@^2.0.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
......@@ -10396,10 +9995,6 @@ tar@^2.0.0:
fstream "^1.0.2"
inherits "2"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
tar@^4:
version "4.4.8"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
......@@ -10593,20 +10188,11 @@ tr46@^1.0.1:
dependencies:
punycode "^2.1.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
trim-newlines@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
......@@ -10617,11 +10203,6 @@ trough@^1.0.0:
resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24"
integrity sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
"true-case-path@^1.0.2":
version "1.0.3"
resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
......@@ -10629,19 +10210,15 @@ trough@^1.0.0:
dependencies:
glob "^7.1.2"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
tryer@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
ts-pnp@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.0.1.tgz#fde74a6371676a167abaeda1ffc0fdb423520098"
integrity sha512-Zzg9XH0anaqhNSlDRibNC8Kp+B9KNM0uRIpLpGkGyrgRIttA7zZBhotTSEoEyuDrz3QW2LGtu2dxuk34HzIGnQ==
version "1.1.2"
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552"
integrity sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA==
tslib@^1.9.0:
version "1.9.3"
......@@ -10704,9 +10281,9 @@ uglify-js@3.4.x:
source-map "~0.6.1"
uglify-js@^3.1.4:
version "3.5.4"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
version "3.5.6"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.6.tgz#8a5f8a06ee7415ac1fa302f4623bc7344b553da4"
integrity sha512-YDKRX8F0Y+Jr7LhoVk0n4G7ltR3Y7qFAj+DtVBthlOgCcIj1hyMigCfousVfn9HKmvJ+qiFlLDwaHx44/e5ZKw==
dependencies:
commander "~2.20.0"
source-map "~0.6.1"
......@@ -11190,34 +10767,17 @@ whatwg-url@^7.0.0:
tr46 "^1.0.1"
webidl-conversions "^4.0.2"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
which-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
<<<<<<< HEAD
<<<<<<< HEAD
which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1:
=======
which@1, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1:
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
which@1, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1:
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
......@@ -11458,11 +11018,6 @@ yargs-parser@^10.1.0:
dependencies:
camelcase "^4.1.0"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
yargs-parser@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
......@@ -11470,10 +11025,6 @@ yargs-parser@^5.0.0:
dependencies:
camelcase "^3.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
yargs-parser@^9.0.2:
version "9.0.2"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
......@@ -11517,11 +11068,6 @@ yargs@^11.0.0:
y18n "^3.2.1"
yargs-parser "^9.0.2"
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
yargs@^7.0.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
......@@ -11541,10 +11087,6 @@ yargs@^7.0.0:
y18n "^3.2.1"
yargs-parser "^5.0.0"
<<<<<<< HEAD
>>>>>>> e9ba0ae97e3b6dd35ef5fbd8cbe6205039dadd98
=======
>>>>>>> cf96ba89553dd025d51302fb756b3248b66198d6
zscroller@~0.4.0:
version "0.4.8"
resolved "https://registry.yarnpkg.com/zscroller/-/zscroller-0.4.8.tgz#69eed68690808eedf81f9714014356b36cdd20f4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment