diff --git a/package.json b/package.json
index 0655f13819ec2e65ab97f486e3b14e5ea30bdbd0..3b591836f33377ce7e7b5d2bb0a903f094c8aa22 100644
--- a/package.json
+++ b/package.json
@@ -26,13 +26,6 @@
},
"dependencies": {
"file-loader": "^1.1.6",
-<<<<<<< HEAD
- "font-awesome": "^4.7.0",
- "html-webpack-plugin": "^2.30.1",
- "node-sass": "4.7.2",
- "react": "16.2.0",
- "react-dom": "16.2.0",
-=======
"html-webpack-plugin": "^2.30.1",
"node-sass": "4.7.2",
"rc-pagination": "1.15.1",
@@ -40,7 +33,6 @@
"react-dom": "16.2.0",
"react-router-dom": "4.2.2",
"simditor": "2.3.6",
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
"url-loader": "0.6.2"
}
}
diff --git a/src/app.jsx b/src/app.jsx
index 2e781b821c95f6cac9f29a5f0c0a073785487761..4e21767227c4c84b43d5cec480e7cdd94c7074d5 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -3,16 +3,6 @@
*/
import React from 'react';
import ReactDOM from 'react-dom';
-<<<<<<< HEAD
-import 'font-awesome/css/font-awesome.min.css'
-import "./index.css"
-import "./index.scss"
-ReactDOM.render(
- wetfgwgawr
,
- document.getElementById('app')
-);
-
-=======
import { BrowserRouter as Router, Switch, Redirect, Route, Link } from 'react-router-dom'
import ProductRouter from 'page/product/router.jsx';
import HeadLineRouter from 'page/headLine/router.jsx';
@@ -59,4 +49,3 @@ ReactDOM.render(
,
document.getElementById("app")
);
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
diff --git a/src/index.css b/src/index.css
deleted file mode 100644
index c638ac9d568eef579786af7f1681e677e626fa24..0000000000000000000000000000000000000000
--- a/src/index.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#app{
- color: red;
- background: url("sa.jpg");
-}
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index b06d0b94391d071399f04fd54c88bdea278cd17c..464668f6b5298c4be70832fbddcdc018542e628d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,15 +2,6 @@
-<<<<<<< HEAD
-
-
- Campuso2o Admin
-
-
-
-test
-=======
Campus-o2o Admin
@@ -20,6 +11,5 @@
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
\ No newline at end of file
diff --git a/src/index.scss b/src/index.scss
deleted file mode 100644
index a1577d9c3ce342e167fce7bc849147ebb48a3ab4..0000000000000000000000000000000000000000
--- a/src/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-body{
- background: #ccc;
- #app{
- font-size: 20px;
- }
-}
\ No newline at end of file
diff --git a/src/sa.jpg b/src/sa.jpg
deleted file mode 100644
index b6aa6aeb45a0c025014cf143809b963d8c18a31f..0000000000000000000000000000000000000000
Binary files a/src/sa.jpg and /dev/null differ
diff --git a/webpack.config.js b/webpack.config.js
index af01439a3da424728fc53edba328ae0b08653551..69585b82ab7142f82b3816e03d9e3a2c05cdf956 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,15 +4,6 @@ const webpack = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const ExtractTextPlugin = require("extract-text-webpack-plugin");
-<<<<<<< HEAD
-module.exports = {
- entry: './src/app.jsx',
- output: {
- path: path.resolve(__dirname, 'dist'),
- publicPath : '/dist/',
- filename: 'js/app.jsx'
-=======
-///
//获取html-webpack-plugin参数方法
var getHtmlConfig = function(name,title){
return{
@@ -25,6 +16,8 @@ var getHtmlConfig = function(name,title){
chunks:["common",name] //指定引入的js模块
}
}
+//环境变量的配置dev/online
+let WEBPACK_ENV = process.env.WEBPACK_ENV ||"dev";
module.exports = {
entry : {
"app" : ["./src/app.jsx"],
@@ -33,7 +26,7 @@ module.exports = {
output: {
path: path.resolve(__dirname, 'dist'),
- publicPath : '/dist/',
+ publicPath : WEBPACK_ENV ==='dev'? '/dist/': "//s.yicdong.com/ampusO2O/dist/",
filename: 'js/[name].jsx'
},
resolve: {
@@ -43,7 +36,6 @@ module.exports = {
util : path.resolve(__dirname, 'src/util'),
service : path.resolve(__dirname, 'src/service')
}
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
},
devServer :{
port : '8086', //设置端口号
@@ -53,13 +45,6 @@ module.exports = {
},
proxy: {
'/manage': {
-<<<<<<< HEAD
- target: 'http://test.happymmall.com/',
- changeOrigin: true
- },
- '/user/logout.do': {
- target: 'http://test.happymmall.com/',
-=======
target: 'http://www.choisaaaa.campuso2o.com/',
changeOrigin: true
},
@@ -69,24 +54,17 @@ module.exports = {
},
'/user/logout.do': {
target: 'http://www.choisaaaa.campuso2o.com/',
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
changeOrigin: true
}
}
},
plugins: [
-<<<<<<< HEAD
- new HtmlWebpackPlugin({//HTML模板处理
- template : './src/index.html'
- }),
-=======
// 处理html文件
new HtmlWebpackPlugin({
template: './src/index.html',
favicon: './favicon.ico'
}),
new HtmlWebpackPlugin(getHtmlConfig("ReactBase","首页")),
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
new ExtractTextPlugin("css/[name].css"),//CSS单独打包
new webpack.optimize.CommonsChunkPlugin({//提出公共模块
name : 'common',
diff --git a/yarn-error.log b/yarn-error.log
index 899a3a24cae36586cc0150a71d5d039882eb4e53..e0f06ab9d67ab56c95ea56108dabe4276db41ae9 100644
--- a/yarn-error.log
+++ b/yarn-error.log
@@ -1,9 +1,5 @@
Arguments:
-<<<<<<< HEAD
- D:\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add sass-loader@6.0.6 --dev
-=======
D:\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add react-router-dom@4.2.2
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
PATH:
C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Program Files\Java\jdk1.8.0_161\bin;C:\Program Files\Java\jdk1.8.0_161\jre\bin;D:\apache-maven-3.0.5\bin;D:\nodejs\;D:\Git\bin;D:\KDiff3\bin;C:\Program Files (x86)\MySQL\MySQL Server 5.1\bin;D:\GitExtensions\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Yarn\bin\;C:\Users\asus\AppData\Local\Microsoft\WindowsApps;C:\Users\asus\AppData\Roaming\npm;C:\Users\asus\AppData\Local\Yarn\bin
@@ -18,12 +14,6 @@ Platform:
win32 x64
Trace:
-<<<<<<< HEAD
- Error: connect ETIMEDOUT 104.16.60.173:443
- at Object._errnoException (util.js:1022:11)
- at _exceptionWithHostPort (util.js:1044:20)
- at TCPConnectWrap.afterConnect [as oncomplete] (net.js:1198:14)
-=======
Error: https://registry.npm.taobao.org/react-router-dom: ESOCKETTIMEDOUT
at ClientRequest. (C:\Program Files (x86)\Yarn\lib\cli.js:133786:19)
at Object.onceWrapper (events.js:313:30)
@@ -35,7 +25,6 @@ Trace:
at TLSSocket.emit (events.js:208:7)
at TLSSocket.Socket._onTimeout (net.js:420:8)
at ontimeout (timers.js:482:11)
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
npm manifest:
{
@@ -46,15 +35,12 @@ npm manifest:
"repository": "git@gitee.com:CampusO2OView/ampusO2O.git",
"author": "choisaaaa ",
"license": "MIT",
-<<<<<<< HEAD
-=======
"scripts": {
"dev": "WEBPACK_ENV=dev node_modules/.bin/webpack-dev-server",
"dev_win": "set WEBPACK_ENV=dev&& node_modules/.bin/webpack-dev-server",
"dist": "WEBPACK_ENV=online node_modules/.bin/webpack -p",
"dist_win": "set WEBPACK_ENV=online&& node_modules/.bin/webpack -p"
},
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
"devDependencies": {
"babel-core": "6.26",
"babel-loader": "7.1.2",
@@ -62,15 +48,6 @@ npm manifest:
"babel-preset-react": "6.24.1",
"css-loader": "0.28.8",
"extract-text-webpack-plugin": "3.0.2",
-<<<<<<< HEAD
- "style-loader": "0.19.1",
- "webpack": "3.10.0"
- },
- "dependencies": {
- "html-webpack-plugin": "^2.30.1",
- "react": "16.2.0",
- "react-dom": "16.2.0"
-=======
"sass-loader": "6.0.6",
"style-loader": "0.19.1",
"webpack": "3.10.0",
@@ -84,7 +61,6 @@ npm manifest:
"react": "16.2.0",
"react-dom": "16.2.0",
"url-loader": "0.6.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
}
}
@@ -100,8 +76,6 @@ Lockfile:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-<<<<<<< HEAD
-=======
accepts@~1.3.4, accepts@~1.3.5:
version "1.3.5"
resolved "http://registry.npm.taobao.org/accepts/download/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
@@ -109,7 +83,6 @@ Lockfile:
mime-types "~2.1.18"
negotiator "0.6.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
acorn-dynamic-import@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -128,11 +101,7 @@ Lockfile:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-<<<<<<< HEAD
- ajv@^5.0.0, ajv@^5.1.5:
-=======
ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
@@ -153,8 +122,6 @@ Lockfile:
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-<<<<<<< HEAD
-=======
amdefine@>=0.0.4:
version "1.0.1"
resolved "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -163,7 +130,6 @@ Lockfile:
version "0.0.7"
resolved "http://registry.npm.taobao.org/ansi-html/download/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -182,8 +148,6 @@ Lockfile:
dependencies:
color-convert "^1.9.0"
-<<<<<<< HEAD
-=======
anymatch@^1.3.0:
version "1.3.2"
resolved "http://registry.npm.taobao.org/anymatch/download/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -191,7 +155,6 @@ Lockfile:
micromatch "^2.1.5"
normalize-path "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
anymatch@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -216,24 +179,17 @@ Lockfile:
dependencies:
sprintf-js "~1.0.2"
-<<<<<<< HEAD
-=======
arr-diff@^2.0.0:
version "2.0.0"
resolved "http://registry.npm.taobao.org/arr-diff/download/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
dependencies:
arr-flatten "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
arr-diff@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-<<<<<<< HEAD
- arr-flatten@^1.1.0:
-=======
arr-flatten@^1.0.1, arr-flatten@^1.1.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.1.0"
resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
@@ -241,8 +197,6 @@ Lockfile:
version "3.1.0"
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-<<<<<<< HEAD
-=======
array-find-index@^1.0.1:
version "1.0.2"
resolved "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -276,7 +230,6 @@ Lockfile:
version "0.2.1"
resolved "http://registry.npm.taobao.org/array-unique/download/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
array-unique@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -293,8 +246,6 @@ Lockfile:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
-<<<<<<< HEAD
-=======
asn1@~0.2.3:
version "0.2.3"
resolved "http://registry.npm.taobao.org/asn1/download/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -307,7 +258,6 @@ Lockfile:
version "0.2.0"
resolved "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
assert@^1.1.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -322,9 +272,6 @@ Lockfile:
version "1.0.1"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-<<<<<<< HEAD
- async@^2.1.2, async@^2.4.1:
-=======
async-foreach@^0.1.3:
version "0.1.3"
resolved "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
@@ -334,19 +281,15 @@ Lockfile:
resolved "http://registry.npm.taobao.org/async/download/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
async@^2.1.2, async@^2.1.5, async@^2.4.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.6.0"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
dependencies:
lodash "^4.14.0"
-<<<<<<< HEAD
-=======
asynckit@^0.4.0:
version "0.4.0"
resolved "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
atob@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
@@ -362,8 +305,6 @@ Lockfile:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
-<<<<<<< HEAD
-=======
aws-sign2@~0.6.0:
version "0.6.0"
resolved "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -376,7 +317,6 @@ Lockfile:
version "1.7.0"
resolved "http://registry.npm.taobao.org/aws4/download/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -935,8 +875,6 @@ Lockfile:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"
-<<<<<<< HEAD
-=======
batch@0.6.1:
version "0.6.1"
resolved "http://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -947,7 +885,6 @@ Lockfile:
dependencies:
tweetnacl "^0.14.3"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
big.js@^3.1.3:
version "3.2.0"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
@@ -956,15 +893,12 @@ Lockfile:
version "1.11.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-<<<<<<< HEAD
-=======
block-stream@*:
version "0.0.9"
resolved "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
dependencies:
inherits "~2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
bluebird@^3.4.7:
version "3.5.1"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -973,8 +907,6 @@ Lockfile:
version "4.11.8"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-<<<<<<< HEAD
-=======
body-parser@1.18.2:
version "1.18.2"
resolved "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
@@ -1001,13 +933,10 @@ Lockfile:
multicast-dns "^6.0.1"
multicast-dns-service-types "^1.1.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
boolbase@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-<<<<<<< HEAD
-=======
boom@2.x.x:
version "2.10.1"
resolved "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -1026,7 +955,6 @@ Lockfile:
dependencies:
hoek "4.x.x"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1034,8 +962,6 @@ Lockfile:
balanced-match "^1.0.0"
concat-map "0.0.1"
-<<<<<<< HEAD
-=======
braces@^1.8.2:
version "1.8.5"
resolved "http://registry.npm.taobao.org/braces/download/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -1044,7 +970,6 @@ Lockfile:
preserve "^0.2.0"
repeat-element "^1.1.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
braces@^2.3.0, braces@^2.3.1:
version "2.3.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -1130,13 +1055,10 @@ Lockfile:
caniuse-lite "^1.0.30000792"
electron-to-chromium "^1.3.30"
-<<<<<<< HEAD
-=======
buffer-indexof@^1.0.0:
version "1.1.1"
resolved "http://registry.npm.taobao.org/buffer-indexof/download/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
buffer-xor@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1157,13 +1079,10 @@ Lockfile:
version "3.0.0"
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-<<<<<<< HEAD
-=======
bytes@3.0.0:
version "3.0.0"
resolved "http://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
cache-base@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1185,8 +1104,6 @@ Lockfile:
no-case "^2.2.0"
upper-case "^1.1.1"
-<<<<<<< HEAD
-=======
camelcase-keys@^2.0.0:
version "2.1.0"
resolved "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -1194,13 +1111,10 @@ Lockfile:
camelcase "^2.0.0"
map-obj "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
camelcase@^1.0.2:
version "1.2.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-<<<<<<< HEAD
-=======
camelcase@^2.0.0:
version "2.1.1"
resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -1209,7 +1123,6 @@ Lockfile:
version "3.0.0"
resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -1231,8 +1144,6 @@ Lockfile:
version "1.0.30000832"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000832.tgz#22a277f1d623774cc9aea2f7c1a65cb1603c63b8"
-<<<<<<< HEAD
-=======
caseless@~0.11.0:
version "0.11.0"
resolved "http://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -1241,7 +1152,6 @@ Lockfile:
version "0.12.0"
resolved "http://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
center-align@^0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -1249,11 +1159,7 @@ Lockfile:
align-text "^0.1.3"
lazy-cache "^1.0.3"
-<<<<<<< HEAD
- chalk@^1.1.3:
-=======
chalk@^1.1.1, chalk@^1.1.3:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
dependencies:
@@ -1271,8 +1177,6 @@ Lockfile:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-<<<<<<< HEAD
-=======
chokidar@^1.6.0:
version "1.7.0"
resolved "http://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1288,7 +1192,6 @@ Lockfile:
optionalDependencies:
fsevents "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
chokidar@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
@@ -1355,8 +1258,6 @@ Lockfile:
strip-ansi "^3.0.1"
wrap-ansi "^2.0.0"
-<<<<<<< HEAD
-=======
clone-deep@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
@@ -1366,7 +1267,6 @@ Lockfile:
kind-of "^3.2.2"
shallow-clone "^0.1.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
clone@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -1428,9 +1328,6 @@ Lockfile:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-<<<<<<< HEAD
- commander@2.15.x, commander@~2.15.0:
-=======
combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
version "1.0.6"
resolved "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -1438,7 +1335,6 @@ Lockfile:
delayed-stream "~1.0.0"
commander@2.15.x, commander@^2.9.0, commander@~2.15.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -1450,8 +1346,6 @@ Lockfile:
version "1.2.1"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-<<<<<<< HEAD
-=======
compressible@~2.0.13:
version "2.0.13"
resolved "http://registry.npm.taobao.org/compressible/download/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
@@ -1470,18 +1364,14 @@ Lockfile:
safe-buffer "5.1.1"
vary "~1.1.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-<<<<<<< HEAD
-=======
connect-history-api-fallback@^1.3.0:
version "1.5.0"
resolved "http://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
console-browserify@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -1496,8 +1386,6 @@ Lockfile:
version "1.0.0"
resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-<<<<<<< HEAD
-=======
content-disposition@0.5.2:
version "0.5.2"
resolved "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@@ -1506,13 +1394,10 @@ Lockfile:
version "1.0.4"
resolved "http://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
convert-source-map@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-<<<<<<< HEAD
-=======
cookie-signature@1.0.6:
version "1.0.6"
resolved "http://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -1521,7 +1406,6 @@ Lockfile:
version "0.3.1"
resolved "http://registry.npm.taobao.org/cookie/download/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
copy-descriptor@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -1534,11 +1418,7 @@ Lockfile:
version "2.5.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
-<<<<<<< HEAD
- core-util-is@~1.0.0:
-=======
core-util-is@1.0.2, core-util-is@~1.0.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -1570,8 +1450,6 @@ Lockfile:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-<<<<<<< HEAD
-=======
cross-spawn@^3.0.0:
version "3.0.1"
resolved "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -1579,7 +1457,6 @@ Lockfile:
lru-cache "^4.0.1"
which "^1.2.9"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -1588,8 +1465,6 @@ Lockfile:
shebang-command "^1.2.0"
which "^1.2.9"
-<<<<<<< HEAD
-=======
cryptiles@2.x.x:
version "2.0.5"
resolved "http://registry.npm.taobao.org/cryptiles/download/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1602,7 +1477,6 @@ Lockfile:
dependencies:
boom "5.x.x"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
crypto-browserify@^3.11.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -1711,53 +1585,40 @@ Lockfile:
clap "^1.0.9"
source-map "^0.5.3"
-<<<<<<< HEAD
-=======
currently-unhandled@^0.4.1:
version "0.4.1"
resolved "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
dependencies:
array-find-index "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
d@1:
version "1.0.0"
resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
dependencies:
es5-ext "^0.10.9"
-<<<<<<< HEAD
-=======
dashdash@^1.12.0:
version "1.14.1"
resolved "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
dependencies:
assert-plus "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
date-now@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-<<<<<<< HEAD
- debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-=======
debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
ms "2.0.0"
-<<<<<<< HEAD
-=======
debug@^3.1.0:
version "3.1.0"
resolved "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
dependencies:
ms "2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1766,19 +1627,14 @@ Lockfile:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-<<<<<<< HEAD
-=======
deep-equal@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
deep-extend@~0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-<<<<<<< HEAD
-=======
define-properties@^1.1.2:
version "1.1.2"
resolved "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -1786,7 +1642,6 @@ Lockfile:
foreach "^2.0.5"
object-keys "^1.0.8"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
define-property@^0.2.5:
version "0.2.5"
resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -1810,8 +1665,6 @@ Lockfile:
version "1.0.0"
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-<<<<<<< HEAD
-=======
del@^3.0.0:
version "3.0.0"
resolved "http://registry.npm.taobao.org/del/download/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -1827,13 +1680,10 @@ Lockfile:
version "1.0.0"
resolved "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-<<<<<<< HEAD
-=======
depd@1.1.1:
version "1.1.1"
resolved "http://registry.npm.taobao.org/depd/download/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
@@ -1842,7 +1692,6 @@ Lockfile:
version "1.1.2"
resolved "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
des.js@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -1850,13 +1699,10 @@ Lockfile:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
-<<<<<<< HEAD
-=======
destroy@~1.0.4:
version "1.0.4"
resolved "http://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
detect-indent@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -1867,13 +1713,10 @@ Lockfile:
version "1.0.3"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-<<<<<<< HEAD
-=======
detect-node@^2.0.3:
version "2.0.3"
resolved "http://registry.npm.taobao.org/detect-node/download/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
diffie-hellman@^5.0.0:
version "5.0.3"
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -1882,8 +1725,6 @@ Lockfile:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
-<<<<<<< HEAD
-=======
dns-equal@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -1901,7 +1742,6 @@ Lockfile:
dependencies:
buffer-indexof "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
dom-converter@~0.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
@@ -1946,8 +1786,6 @@ Lockfile:
dom-serializer "0"
domelementtype "1"
-<<<<<<< HEAD
-=======
ecc-jsbn@~0.1.1:
version "0.1.1"
resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -1958,7 +1796,6 @@ Lockfile:
version "1.1.1"
resolved "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
version "1.3.44"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.44.tgz#ef6b150a60d523082388cadad88085ecd2fd4684"
@@ -1979,13 +1816,10 @@ Lockfile:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-<<<<<<< HEAD
-=======
encodeurl@~1.0.2:
version "1.0.2"
resolved "http://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
encoding@^0.1.11:
version "0.1.12"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -2017,8 +1851,6 @@ Lockfile:
dependencies:
is-arrayish "^0.2.1"
-<<<<<<< HEAD
-=======
es-abstract@^1.7.0:
version "1.11.0"
resolved "http://registry.npm.taobao.org/es-abstract/download/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
@@ -2037,7 +1869,6 @@ Lockfile:
is-date-object "^1.0.1"
is-symbol "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
version "0.10.42"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
@@ -2091,13 +1922,10 @@ Lockfile:
es6-iterator "^2.0.1"
es6-symbol "^3.1.1"
-<<<<<<< HEAD
-=======
escape-html@~1.0.3:
version "1.0.3"
resolved "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -2129,13 +1957,10 @@ Lockfile:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-<<<<<<< HEAD
-=======
etag@~1.8.1:
version "1.8.1"
resolved "http://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
event-emitter@~0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
@@ -2143,26 +1968,20 @@ Lockfile:
d "1"
es5-ext "~0.10.14"
-<<<<<<< HEAD
-=======
eventemitter3@^3.0.0:
version "3.1.0"
resolved "http://registry.npm.taobao.org/eventemitter3/download/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
events@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-<<<<<<< HEAD
-=======
eventsource@0.1.6:
version "0.1.6"
resolved "http://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
dependencies:
original ">=0.0.5"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -2182,15 +2001,12 @@ Lockfile:
signal-exit "^3.0.0"
strip-eof "^1.0.0"
-<<<<<<< HEAD
-=======
expand-brackets@^0.1.4:
version "0.1.5"
resolved "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
dependencies:
is-posix-bracket "^0.1.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
expand-brackets@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -2203,8 +2019,6 @@ Lockfile:
snapdragon "^0.8.1"
to-regex "^3.0.1"
-<<<<<<< HEAD
-=======
expand-range@^1.8.1:
version "1.8.2"
resolved "http://registry.npm.taobao.org/expand-range/download/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -2246,7 +2060,6 @@ Lockfile:
utils-merge "1.0.1"
vary "~1.1.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
extend-shallow@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2260,8 +2073,6 @@ Lockfile:
assign-symbols "^1.0.0"
is-extendable "^1.0.1"
-<<<<<<< HEAD
-=======
extend@~3.0.0, extend@~3.0.1:
version "3.0.1"
resolved "http://registry.npm.taobao.org/extend/download/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2272,7 +2083,6 @@ Lockfile:
dependencies:
is-extglob "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
extglob@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -2295,8 +2105,6 @@ Lockfile:
schema-utils "^0.3.0"
webpack-sources "^1.0.1"
-<<<<<<< HEAD
-=======
extsprintf@1.3.0:
version "1.3.0"
resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -2305,7 +2113,6 @@ Lockfile:
version "1.4.0"
resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
fast-deep-equal@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -2318,8 +2125,6 @@ Lockfile:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-<<<<<<< HEAD
-=======
faye-websocket@^0.10.0:
version "0.10.0"
resolved "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -2332,7 +2137,6 @@ Lockfile:
dependencies:
websocket-driver ">=0.5.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
fbjs@^0.8.16:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
@@ -2345,8 +2149,6 @@ Lockfile:
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"
-<<<<<<< HEAD
-=======
file-loader@^1.1.6:
version "1.1.6"
resolved "http://registry.npm.taobao.org/file-loader/download/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
@@ -2368,7 +2170,6 @@ Lockfile:
repeat-element "^1.1.2"
repeat-string "^1.5.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
fill-range@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -2378,8 +2179,6 @@ Lockfile:
repeat-string "^1.6.1"
to-regex-range "^2.1.0"
-<<<<<<< HEAD
-=======
finalhandler@1.1.1:
version "1.1.1"
resolved "http://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -2392,7 +2191,6 @@ Lockfile:
statuses "~1.4.0"
unpipe "~1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
find-cache-dir@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -2401,8 +2199,6 @@ Lockfile:
make-dir "^1.0.0"
pkg-dir "^2.0.0"
-<<<<<<< HEAD
-=======
find-up@^1.0.0:
version "1.1.2"
resolved "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -2410,7 +2206,6 @@ Lockfile:
path-exists "^2.0.0"
pinkie-promise "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
find-up@^2.0.0, find-up@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -2421,12 +2216,6 @@ Lockfile:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-<<<<<<< HEAD
- for-in@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-=======
follow-redirects@^1.0.0:
version "1.4.1"
resolved "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa"
@@ -2485,20 +2274,16 @@ Lockfile:
version "0.1.2"
resolved "http://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
fragment-cache@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
dependencies:
map-cache "^0.2.2"
-<<<<<<< HEAD
-=======
fresh@0.5.2:
version "0.5.2"
resolved "http://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
fs-minipass@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -2509,20 +2294,13 @@ Lockfile:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-<<<<<<< HEAD
- fsevents@^1.1.2:
-=======
fsevents@^1.0.0, fsevents@^1.1.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.2.3"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
dependencies:
nan "^2.9.2"
node-pre-gyp "^0.9.0"
-<<<<<<< HEAD
- function-bind@^1.0.2:
-=======
fstream@^1.0.0, fstream@^1.0.2:
version "1.0.11"
resolved "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
@@ -2533,7 +2311,6 @@ Lockfile:
rimraf "2"
function-bind@^1.0.2, function-bind@^1.1.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2550,8 +2327,6 @@ Lockfile:
strip-ansi "^3.0.1"
wide-align "^1.1.0"
-<<<<<<< HEAD
-=======
gaze@^1.0.0:
version "1.1.2"
resolved "http://registry.npm.taobao.org/gaze/download/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
@@ -2568,18 +2343,14 @@ Lockfile:
dependencies:
is-property "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-<<<<<<< HEAD
-=======
get-stdin@^4.0.1:
version "4.0.1"
resolved "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -2588,8 +2359,6 @@ Lockfile:
version "2.0.6"
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-<<<<<<< HEAD
-=======
getpass@^0.1.1:
version "0.1.7"
resolved "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2609,7 +2378,6 @@ Lockfile:
dependencies:
is-glob "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
glob-parent@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -2617,16 +2385,6 @@ Lockfile:
is-glob "^3.1.0"
path-dirname "^1.0.0"
-<<<<<<< HEAD
- glob@^7.0.5:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.4"
-=======
glob@^6.0.4:
version "6.0.4"
resolved "http://registry.npm.taobao.org/glob/download/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -2645,7 +2403,6 @@ Lockfile:
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
once "^1.3.0"
path-is-absolute "^1.0.0"
@@ -2653,8 +2410,6 @@ Lockfile:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-<<<<<<< HEAD
-=======
globby@^6.1.0:
version "6.1.0"
resolved "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -2673,13 +2428,10 @@ Lockfile:
lodash "~4.17.4"
minimatch "~3.0.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
graceful-fs@^4.1.2:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-<<<<<<< HEAD
-=======
handle-thing@^1.2.5:
version "1.2.5"
resolved "http://registry.npm.taobao.org/handle-thing/download/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -2704,7 +2456,6 @@ Lockfile:
ajv "^5.1.0"
har-schema "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
has-ansi@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -2774,8 +2525,6 @@ Lockfile:
inherits "^2.0.3"
minimalistic-assert "^1.0.0"
-<<<<<<< HEAD
-=======
hawk@~3.1.3:
version "3.1.3"
resolved "http://registry.npm.taobao.org/hawk/download/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -2794,7 +2543,6 @@ Lockfile:
hoek "4.x.x"
sntp "2.x.x"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
he@1.1.x:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -2807,8 +2555,6 @@ Lockfile:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
-<<<<<<< HEAD
-=======
hoek@2.x.x:
version "2.16.3"
resolved "http://registry.npm.taobao.org/hoek/download/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -2817,7 +2563,6 @@ Lockfile:
version "4.2.1"
resolved "http://registry.npm.taobao.org/hoek/download/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
home-or-tmp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -2829,8 +2574,6 @@ Lockfile:
version "2.6.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
-<<<<<<< HEAD
-=======
hpack.js@^2.1.6:
version "2.1.6"
resolved "http://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -2840,18 +2583,14 @@ Lockfile:
readable-stream "^2.0.1"
wbuf "^1.1.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
html-comment-regex@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-<<<<<<< HEAD
-=======
html-entities@^1.2.0:
version "1.2.1"
resolved "http://registry.npm.taobao.org/html-entities/download/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
html-minifier@^3.2.3:
version "3.5.15"
resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0"
@@ -2884,8 +2623,6 @@ Lockfile:
domutils "1.1"
readable-stream "1.0"
-<<<<<<< HEAD
-=======
http-deceiver@^1.2.7:
version "1.2.7"
resolved "http://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -2945,18 +2682,14 @@ Lockfile:
jsprim "^1.2.2"
sshpk "^1.7.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
https-browserify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-<<<<<<< HEAD
-=======
iconv-lite@0.4.19:
version "0.4.19"
resolved "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
iconv-lite@^0.4.4, iconv-lite@~0.4.13:
version "0.4.21"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
@@ -2983,8 +2716,6 @@ Lockfile:
dependencies:
minimatch "^3.0.4"
-<<<<<<< HEAD
-=======
import-local@^0.1.1:
version "0.1.1"
resolved "http://registry.npm.taobao.org/import-local/download/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
@@ -3002,7 +2733,6 @@ Lockfile:
dependencies:
repeating "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
indexes-of@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -3018,11 +2748,7 @@ Lockfile:
once "^1.3.0"
wrappy "1"
-<<<<<<< HEAD
- inherits@2, 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:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -3034,15 +2760,12 @@ Lockfile:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-<<<<<<< HEAD
-=======
internal-ip@1.2.0:
version "1.2.0"
resolved "http://registry.npm.taobao.org/internal-ip/download/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
dependencies:
meow "^3.3.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
interpret@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -3057,8 +2780,6 @@ Lockfile:
version "1.0.0"
resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-<<<<<<< HEAD
-=======
ip@^1.1.0, ip@^1.1.5:
version "1.1.5"
resolved "http://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -3067,7 +2788,6 @@ Lockfile:
version "1.6.0"
resolved "http://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-absolute-url@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -3094,11 +2814,7 @@ Lockfile:
dependencies:
binary-extensions "^1.0.0"
-<<<<<<< HEAD
- is-buffer@^1.1.5:
-=======
is-buffer@^1.0.2, is-buffer@^1.1.5:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -3108,13 +2824,10 @@ Lockfile:
dependencies:
builtin-modules "^1.0.0"
-<<<<<<< HEAD
-=======
is-callable@^1.1.1, is-callable@^1.1.3:
version "1.1.3"
resolved "http://registry.npm.taobao.org/is-callable/download/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-data-descriptor@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -3127,13 +2840,10 @@ Lockfile:
dependencies:
kind-of "^6.0.0"
-<<<<<<< HEAD
-=======
is-date-object@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-descriptor@^0.1.0:
version "0.1.6"
resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -3150,8 +2860,6 @@ Lockfile:
is-data-descriptor "^1.0.0"
kind-of "^6.0.2"
-<<<<<<< HEAD
-=======
is-dotfile@^1.0.0:
version "1.0.3"
resolved "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -3162,7 +2870,6 @@ Lockfile:
dependencies:
is-primitive "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-extendable@^0.1.0, is-extendable@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3173,13 +2880,10 @@ Lockfile:
dependencies:
is-plain-object "^2.0.4"
-<<<<<<< HEAD
-=======
is-extglob@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-extglob@^2.1.0, is-extglob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -3200,15 +2904,12 @@ Lockfile:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-<<<<<<< HEAD
-=======
is-glob@^2.0.0, is-glob@^2.0.1:
version "2.0.1"
resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
dependencies:
is-extglob "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-glob@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -3221,8 +2922,6 @@ Lockfile:
dependencies:
is-extglob "^2.1.1"
-<<<<<<< HEAD
-=======
is-my-ip-valid@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/is-my-ip-valid/download/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
@@ -3243,7 +2942,6 @@ Lockfile:
dependencies:
kind-of "^3.0.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-number@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3260,8 +2958,6 @@ Lockfile:
dependencies:
is-number "^4.0.0"
-<<<<<<< HEAD
-=======
is-path-cwd@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -3278,7 +2974,6 @@ Lockfile:
dependencies:
path-is-inside "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-plain-obj@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -3289,8 +2984,6 @@ Lockfile:
dependencies:
isobject "^3.0.1"
-<<<<<<< HEAD
-=======
is-posix-bracket@^0.1.0:
version "0.1.1"
resolved "http://registry.npm.taobao.org/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -3309,7 +3002,6 @@ Lockfile:
dependencies:
has "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-stream@^1.0.1, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -3320,8 +3012,6 @@ Lockfile:
dependencies:
html-comment-regex "^1.1.0"
-<<<<<<< HEAD
-=======
is-symbol@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -3334,18 +3024,14 @@ Lockfile:
version "0.2.1"
resolved "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
is-windows@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-<<<<<<< HEAD
-=======
is-wsl@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/is-wsl/download/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
isarray@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3375,15 +3061,11 @@ Lockfile:
node-fetch "^1.0.1"
whatwg-fetch ">=0.10.0"
-<<<<<<< HEAD
- js-base64@^2.1.9:
-=======
isstream@~0.1.2:
version "0.1.2"
resolved "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
js-base64@^2.1.8, js-base64@^2.1.9:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.4.3"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
@@ -3398,13 +3080,10 @@ Lockfile:
argparse "^1.0.7"
esprima "^2.6.0"
-<<<<<<< HEAD
-=======
jsbn@~0.1.0:
version "0.1.1"
resolved "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
jsesc@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -3421,8 +3100,6 @@ Lockfile:
version "0.3.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-<<<<<<< HEAD
-=======
json-schema@0.2.3:
version "0.2.3"
resolved "http://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -3435,14 +3112,10 @@ Lockfile:
version "3.3.2"
resolved "http://registry.npm.taobao.org/json3/download/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-<<<<<<< HEAD
- kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-=======
jsonpointer@^4.0.0:
version "4.0.1"
resolved "http://registry.npm.taobao.org/jsonpointer/download/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -3467,7 +3140,6 @@ Lockfile:
is-buffer "^1.0.2"
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "3.2.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
dependencies:
@@ -3487,13 +3159,10 @@ Lockfile:
version "6.0.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-<<<<<<< HEAD
-=======
lazy-cache@^0.2.3:
version "0.2.7"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
lazy-cache@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -3504,8 +3173,6 @@ Lockfile:
dependencies:
invert-kv "^1.0.0"
-<<<<<<< HEAD
-=======
load-json-file@^1.0.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -3516,7 +3183,6 @@ Lockfile:
pinkie-promise "^2.0.0"
strip-bom "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
load-json-file@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -3539,11 +3205,7 @@ Lockfile:
json5 "^0.5.0"
object-assign "^4.0.1"
-<<<<<<< HEAD
- loader-utils@^1.0.2, loader-utils@^1.1.0:
-=======
loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.1.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
dependencies:
@@ -3558,30 +3220,22 @@ Lockfile:
p-locate "^2.0.0"
path-exists "^3.0.0"
-<<<<<<< HEAD
-=======
lodash.assign@^4.2.0:
version "4.2.0"
resolved "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
lodash.camelcase@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-<<<<<<< HEAD
-=======
lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-<<<<<<< HEAD
-=======
lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -3590,17 +3244,10 @@ Lockfile:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-<<<<<<< HEAD
- lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4:
- version "4.17.10"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-=======
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@~4.17.4:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
@@ -3609,7 +3256,6 @@ Lockfile:
version "1.6.1"
resolved "http://registry.npm.taobao.org/loglevel/download/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
longest@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -3620,8 +3266,6 @@ Lockfile:
dependencies:
js-tokens "^3.0.0"
-<<<<<<< HEAD
-=======
loud-rejection@^1.0.0:
version "1.6.0"
resolved "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -3629,7 +3273,6 @@ Lockfile:
currently-unhandled "^0.4.1"
signal-exit "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
@@ -3655,13 +3298,10 @@ Lockfile:
version "0.2.2"
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-<<<<<<< HEAD
-=======
map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
map-visit@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -3679,13 +3319,10 @@ Lockfile:
hash-base "^3.0.0"
inherits "^2.0.1"
-<<<<<<< HEAD
-=======
media-typer@0.3.0:
version "0.3.0"
resolved "http://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
mem@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
@@ -3699,8 +3336,6 @@ Lockfile:
errno "^0.1.3"
readable-stream "^2.0.1"
-<<<<<<< HEAD
-=======
meow@^3.3.0, meow@^3.7.0:
version "3.7.0"
resolved "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -3742,7 +3377,6 @@ Lockfile:
parse-glob "^3.0.4"
regex-cache "^0.4.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
micromatch@^3.1.4:
version "3.1.10"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -3768,8 +3402,6 @@ Lockfile:
bn.js "^4.0.0"
brorand "^1.0.1"
-<<<<<<< HEAD
-=======
"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
version "1.33.0"
resolved "http://registry.npm.taobao.org/mime-db/download/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
@@ -3788,7 +3420,6 @@ Lockfile:
version "1.6.0"
resolved "http://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -3801,11 +3432,7 @@ Lockfile:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-<<<<<<< HEAD
- minimatch@^3.0.2, minimatch@^3.0.4:
-=======
"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
dependencies:
@@ -3815,11 +3442,7 @@ Lockfile:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-<<<<<<< HEAD
- minimist@^1.2.0:
-=======
minimist@^1.1.3, minimist@^1.2.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
@@ -3843,9 +3466,6 @@ Lockfile:
for-in "^1.0.2"
is-extendable "^1.0.1"
-<<<<<<< HEAD
- mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-=======
mixin-object@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
@@ -3854,7 +3474,6 @@ Lockfile:
is-extendable "^0.1.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:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
@@ -3864,9 +3483,6 @@ Lockfile:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-<<<<<<< HEAD
- nan@^2.9.2:
-=======
multicast-dns-service-types@^1.1.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -3879,7 +3495,6 @@ Lockfile:
thunky "^1.0.2"
nan@^2.3.2, nan@^2.9.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.10.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -3908,13 +3523,10 @@ Lockfile:
iconv-lite "^0.4.4"
sax "^1.2.4"
-<<<<<<< HEAD
-=======
negotiator@0.6.1:
version "0.6.1"
resolved "http://registry.npm.taobao.org/negotiator/download/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
neo-async@^2.5.0:
version "2.5.1"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
@@ -3936,8 +3548,6 @@ Lockfile:
encoding "^0.1.11"
is-stream "^1.0.1"
-<<<<<<< HEAD
-=======
node-forge@0.7.1:
version "0.7.1"
resolved "http://registry.npm.taobao.org/node-forge/download/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
@@ -3960,7 +3570,6 @@ Lockfile:
tar "^2.0.0"
which "1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
node-libs-browser@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
@@ -4004,8 +3613,6 @@ Lockfile:
semver "^5.3.0"
tar "^4"
-<<<<<<< HEAD
-=======
node-sass@4.7.2:
version "4.7.2"
resolved "http://registry.npm.taobao.org/node-sass/download/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
@@ -4036,7 +3643,6 @@ Lockfile:
dependencies:
abbrev "1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
nopt@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -4044,11 +3650,7 @@ Lockfile:
abbrev "1"
osenv "^0.1.4"
-<<<<<<< HEAD
- normalize-package-data@^2.3.2:
-=======
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.4.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
dependencies:
@@ -4057,11 +3659,7 @@ Lockfile:
semver "2 || 3 || 4 || 5"
validate-npm-package-license "^3.0.1"
-<<<<<<< HEAD
- normalize-path@^2.1.1:
-=======
normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.1.1"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
dependencies:
@@ -4097,11 +3695,7 @@ Lockfile:
dependencies:
path-key "^2.0.0"
-<<<<<<< HEAD
- npmlog@^4.0.2:
-=======
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
dependencies:
@@ -4124,13 +3718,10 @@ Lockfile:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-<<<<<<< HEAD
-=======
oauth-sign@~0.8.1, oauth-sign@~0.8.2:
version "0.8.2"
resolved "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -4143,21 +3734,16 @@ Lockfile:
define-property "^0.2.5"
kind-of "^3.0.3"
-<<<<<<< HEAD
-=======
object-keys@^1.0.8:
version "1.0.11"
resolved "http://registry.npm.taobao.org/object-keys/download/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
object-visit@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
dependencies:
isobject "^3.0.0"
-<<<<<<< HEAD
-=======
object.omit@^2.0.0:
version "2.0.1"
resolved "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4165,15 +3751,12 @@ Lockfile:
for-own "^0.1.4"
is-extendable "^0.1.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
object.pick@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
dependencies:
isobject "^3.0.1"
-<<<<<<< HEAD
-=======
obuf@^1.0.0, obuf@^1.1.1:
version "1.1.2"
resolved "http://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -4188,15 +3771,12 @@ Lockfile:
version "1.0.1"
resolved "http://registry.npm.taobao.org/on-headers/download/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
dependencies:
wrappy "1"
-<<<<<<< HEAD
-=======
opn@^5.1.0:
version "5.3.0"
resolved "http://registry.npm.taobao.org/opn/download/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
@@ -4209,7 +3789,6 @@ Lockfile:
dependencies:
url-parse "1.0.x"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
os-browserify@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -4218,15 +3797,12 @@ Lockfile:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-<<<<<<< HEAD
-=======
os-locale@^1.4.0:
version "1.4.0"
resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
dependencies:
lcid "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
os-locale@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -4239,11 +3815,7 @@ Lockfile:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-<<<<<<< HEAD
- osenv@^0.1.4:
-=======
osenv@0, osenv@^0.1.4:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "0.1.5"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
dependencies:
@@ -4266,13 +3838,10 @@ Lockfile:
dependencies:
p-limit "^1.1.0"
-<<<<<<< HEAD
-=======
p-map@^1.1.1:
version "1.2.0"
resolved "http://registry.npm.taobao.org/p-map/download/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -4297,8 +3866,6 @@ Lockfile:
evp_bytestokey "^1.0.0"
pbkdf2 "^3.0.3"
-<<<<<<< HEAD
-=======
parse-glob@^3.0.4:
version "3.0.4"
resolved "http://registry.npm.taobao.org/parse-glob/download/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -4308,20 +3875,16 @@ Lockfile:
is-extglob "^1.0.0"
is-glob "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
parse-json@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
dependencies:
error-ex "^1.2.0"
-<<<<<<< HEAD
-=======
parseurl@~1.3.2:
version "1.3.2"
resolved "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -4334,15 +3897,12 @@ Lockfile:
version "1.0.2"
resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-<<<<<<< HEAD
-=======
path-exists@^2.0.0:
version "2.1.0"
resolved "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
dependencies:
pinkie-promise "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
path-exists@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -4351,19 +3911,14 @@ Lockfile:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-<<<<<<< HEAD
-=======
path-is-inside@^1.0.1:
version "1.0.2"
resolved "http://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
path-key@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-<<<<<<< HEAD
-=======
path-to-regexp@0.1.7:
version "0.1.7"
resolved "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -4376,7 +3931,6 @@ Lockfile:
pify "^2.0.0"
pinkie-promise "^2.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
path-type@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -4393,13 +3947,10 @@ Lockfile:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-<<<<<<< HEAD
-=======
performance-now@^2.1.0:
version "2.1.0"
resolved "http://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
pify@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -4408,8 +3959,6 @@ Lockfile:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-<<<<<<< HEAD
-=======
pinkie-promise@^2.0.0:
version "2.0.1"
resolved "http://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -4420,15 +3969,12 @@ Lockfile:
version "2.0.4"
resolved "http://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
pkg-dir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
dependencies:
find-up "^2.1.0"
-<<<<<<< HEAD
-=======
portfinder@^1.0.9:
version "1.0.13"
resolved "http://registry.npm.taobao.org/portfinder/download/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@@ -4437,7 +3983,6 @@ Lockfile:
debug "^2.2.0"
mkdirp "0.5.x"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -4692,13 +4237,10 @@ Lockfile:
version "1.0.4"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-<<<<<<< HEAD
-=======
preserve@^0.2.0:
version "0.2.0"
resolved "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
pretty-error@^2.0.2:
version "2.1.1"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -4732,8 +4274,6 @@ Lockfile:
loose-envify "^1.3.1"
object-assign "^4.1.1"
-<<<<<<< HEAD
-=======
proxy-addr@~2.0.3:
version "2.0.3"
resolved "http://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
@@ -4741,7 +4281,6 @@ Lockfile:
forwarded "~0.1.2"
ipaddr.js "1.6.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
prr@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -4764,11 +4303,7 @@ Lockfile:
version "1.3.2"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-<<<<<<< HEAD
- punycode@^1.2.4:
-=======
punycode@^1.2.4, punycode@^1.4.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -4776,8 +4311,6 @@ Lockfile:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-<<<<<<< HEAD
-=======
qs@6.5.1, qs@~6.5.1:
version "6.5.1"
resolved "http://registry.npm.taobao.org/qs/download/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -4786,7 +4319,6 @@ Lockfile:
version "6.3.2"
resolved "http://registry.npm.taobao.org/qs/download/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
query-string@^4.1.0:
version "4.3.4"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -4802,8 +4334,6 @@ Lockfile:
version "0.2.0"
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-<<<<<<< HEAD
-=======
querystringify@0.0.x:
version "0.0.4"
resolved "http://registry.npm.taobao.org/querystringify/download/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
@@ -4819,7 +4349,6 @@ Lockfile:
is-number "^3.0.0"
kind-of "^4.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
@@ -4833,8 +4362,6 @@ Lockfile:
randombytes "^2.0.5"
safe-buffer "^5.1.0"
-<<<<<<< HEAD
-=======
range-parser@^1.0.3, range-parser@~1.2.0:
version "1.2.0"
resolved "http://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -4848,7 +4375,6 @@ Lockfile:
iconv-lite "0.4.19"
unpipe "1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
rc@^1.1.7:
version "1.2.6"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
@@ -4876,8 +4402,6 @@ Lockfile:
object-assign "^4.1.1"
prop-types "^15.6.0"
-<<<<<<< HEAD
-=======
read-pkg-up@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -4885,7 +4409,6 @@ Lockfile:
find-up "^1.0.0"
read-pkg "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
read-pkg-up@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -4893,8 +4416,6 @@ Lockfile:
find-up "^2.0.0"
read-pkg "^2.0.0"
-<<<<<<< HEAD
-=======
read-pkg@^1.0.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -4903,7 +4424,6 @@ Lockfile:
normalize-package-data "^2.3.2"
path-type "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
read-pkg@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -4921,11 +4441,7 @@ Lockfile:
isarray "0.0.1"
string_decoder "~0.10.x"
-<<<<<<< HEAD
- readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.3.3:
-=======
readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.9, readable-stream@^2.3.3:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
dependencies:
@@ -4946,8 +4462,6 @@ Lockfile:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"
-<<<<<<< HEAD
-=======
redent@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -4955,7 +4469,6 @@ Lockfile:
indent-string "^2.1.0"
strip-indent "^1.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
reduce-css-calc@^1.2.6:
version "1.3.0"
resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -4986,15 +4499,12 @@ Lockfile:
babel-types "^6.19.0"
private "^0.1.6"
-<<<<<<< HEAD
-=======
regex-cache@^0.4.2:
version "0.4.4"
resolved "http://registry.npm.taobao.org/regex-cache/download/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
dependencies:
is-equal-shallow "^0.1.3"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
regex-not@^1.0.0, regex-not@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -5060,8 +4570,6 @@ Lockfile:
dependencies:
is-finite "^1.0.0"
-<<<<<<< HEAD
-=======
request@2:
version "2.85.0"
resolved "http://registry.npm.taobao.org/request/download/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
@@ -5114,7 +4622,6 @@ Lockfile:
tunnel-agent "~0.4.1"
uuid "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5123,8 +4630,6 @@ Lockfile:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-<<<<<<< HEAD
-=======
requires-port@1.0.x, requires-port@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -5139,7 +4644,6 @@ Lockfile:
version "3.0.0"
resolved "http://registry.npm.taobao.org/resolve-from/download/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -5154,11 +4658,7 @@ Lockfile:
dependencies:
align-text "^0.1.1"
-<<<<<<< HEAD
- rimraf@^2.6.1:
-=======
rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.6.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
@@ -5171,13 +4671,10 @@ Lockfile:
hash-base "^3.0.0"
inherits "^2.0.1"
-<<<<<<< HEAD
-=======
safe-buffer@5.1.1:
version "5.1.1"
resolved "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -5192,8 +4689,6 @@ Lockfile:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-<<<<<<< HEAD
-=======
sass-graph@^2.2.4:
version "2.2.4"
resolved "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -5213,7 +4708,6 @@ Lockfile:
lodash.tail "^4.1.1"
pify "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
sax@^1.2.4, sax@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -5224,8 +4718,6 @@ Lockfile:
dependencies:
ajv "^5.0.0"
-<<<<<<< HEAD
-=======
scss-tokenizer@^0.2.3:
version "0.2.3"
resolved "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -5243,13 +4735,10 @@ Lockfile:
dependencies:
node-forge "0.7.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
"semver@2 || 3 || 4 || 5", semver@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-<<<<<<< HEAD
-=======
semver@~5.3.0:
version "5.3.0"
resolved "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -5293,7 +4782,6 @@ Lockfile:
parseurl "~1.3.2"
send "0.16.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -5324,8 +4812,6 @@ Lockfile:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-<<<<<<< HEAD
-=======
setprototypeof@1.0.3:
version "1.0.3"
resolved "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
@@ -5334,7 +4820,6 @@ Lockfile:
version "1.1.0"
resolved "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
sha.js@^2.4.0, sha.js@^2.4.8:
version "2.4.11"
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -5342,8 +4827,6 @@ Lockfile:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-<<<<<<< HEAD
-=======
shallow-clone@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
@@ -5353,7 +4836,6 @@ Lockfile:
lazy-cache "^0.2.3"
mixin-object "^2.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -5399,8 +4881,6 @@ Lockfile:
source-map-resolve "^0.5.0"
use "^3.1.0"
-<<<<<<< HEAD
-=======
sntp@1.x.x:
version "1.0.9"
resolved "http://registry.npm.taobao.org/sntp/download/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -5431,7 +4911,6 @@ Lockfile:
faye-websocket "^0.10.0"
uuid "^2.0.2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -5466,15 +4945,12 @@ Lockfile:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-<<<<<<< HEAD
-=======
source-map@^0.4.2:
version "0.4.4"
resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
dependencies:
amdefine ">=0.0.4"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -5501,8 +4977,6 @@ Lockfile:
version "3.0.0"
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
-<<<<<<< HEAD
-=======
spdy-transport@^2.0.18:
version "2.1.0"
resolved "http://registry.npm.taobao.org/spdy-transport/download/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
@@ -5526,7 +5000,6 @@ Lockfile:
select-hose "^2.0.0"
spdy-transport "^2.0.18"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -5537,8 +5010,6 @@ Lockfile:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-<<<<<<< HEAD
-=======
sshpk@^1.7.0:
version "1.14.1"
resolved "http://registry.npm.taobao.org/sshpk/download/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
@@ -5553,7 +5024,6 @@ Lockfile:
jsbn "~0.1.0"
tweetnacl "~0.14.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
static-extend@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -5561,8 +5031,6 @@ Lockfile:
define-property "^0.2.5"
object-copy "^0.1.0"
-<<<<<<< HEAD
-=======
"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
version "1.5.0"
resolved "http://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -5577,7 +5045,6 @@ Lockfile:
dependencies:
readable-stream "^2.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
stream-browserify@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -5624,13 +5091,10 @@ Lockfile:
version "0.10.31"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-<<<<<<< HEAD
-=======
stringstream@~0.0.4, stringstream@~0.0.5:
version "0.0.5"
resolved "http://registry.npm.taobao.org/stringstream/download/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
strip-ansi@^3.0.0, strip-ansi@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -5643,15 +5107,12 @@ Lockfile:
dependencies:
ansi-regex "^3.0.0"
-<<<<<<< HEAD
-=======
strip-bom@^2.0.0:
version "2.0.0"
resolved "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
dependencies:
is-utf8 "^0.2.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -5660,15 +5121,12 @@ Lockfile:
version "1.0.0"
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-<<<<<<< HEAD
-=======
strip-indent@^1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
dependencies:
get-stdin "^4.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
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"
@@ -5718,8 +5176,6 @@ Lockfile:
version "0.2.8"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
-<<<<<<< HEAD
-=======
tar@^2.0.0:
version "2.2.1"
resolved "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -5728,7 +5184,6 @@ Lockfile:
fstream "^1.0.2"
inherits "2"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
tar@^4:
version "4.4.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
@@ -5741,8 +5196,6 @@ Lockfile:
safe-buffer "^5.1.1"
yallist "^3.0.2"
-<<<<<<< HEAD
-=======
thunky@^1.0.2:
version "1.0.2"
resolved "http://registry.npm.taobao.org/thunky/download/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
@@ -5751,7 +5204,6 @@ Lockfile:
version "2.0.0"
resolved "http://registry.npm.taobao.org/time-stamp/download/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
timers-browserify@^2.0.4:
version "2.0.10"
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
@@ -5792,8 +5244,6 @@ Lockfile:
version "1.0.7"
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
-<<<<<<< HEAD
-=======
tough-cookie@~2.3.0, tough-cookie@~2.3.3:
version "2.3.4"
resolved "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -5804,26 +5254,20 @@ Lockfile:
version "1.0.0"
resolved "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-<<<<<<< HEAD
-=======
"true-case-path@^1.0.2":
version "1.0.2"
resolved "http://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
dependencies:
glob "^6.0.4"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-<<<<<<< HEAD
-=======
tunnel-agent@^0.6.0:
version "0.6.0"
resolved "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -5845,7 +5289,6 @@ Lockfile:
media-typer "0.3.0"
mime-types "~2.1.18"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
ua-parser-js@^0.7.9:
version "0.7.17"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
@@ -5901,13 +5344,10 @@ Lockfile:
version "2.0.0"
resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-<<<<<<< HEAD
-=======
unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
unset-value@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -5927,8 +5367,6 @@ Lockfile:
version "0.1.0"
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-<<<<<<< HEAD
-=======
url-loader@0.6.2:
version "0.6.2"
resolved "http://registry.npm.taobao.org/url-loader/download/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
@@ -5951,7 +5389,6 @@ Lockfile:
querystringify "^2.0.0"
requires-port "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
url@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -5983,8 +5420,6 @@ Lockfile:
version "0.4.0"
resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-<<<<<<< HEAD
-=======
utils-merge@1.0.1:
version "1.0.1"
resolved "http://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -5997,7 +5432,6 @@ Lockfile:
version "3.2.1"
resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
validate-npm-package-license@^3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
@@ -6005,19 +5439,14 @@ Lockfile:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
-<<<<<<< HEAD
-=======
vary@~1.1.2:
version "1.1.2"
resolved "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
vendors@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
-<<<<<<< HEAD
-=======
verror@1.10.0:
version "1.10.0"
resolved "http://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -6026,7 +5455,6 @@ Lockfile:
core-util-is "1.0.2"
extsprintf "^1.2.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
vm-browserify@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -6041,8 +5469,6 @@ Lockfile:
graceful-fs "^4.1.2"
neo-async "^2.5.0"
-<<<<<<< HEAD
-=======
wbuf@^1.1.0, wbuf@^1.7.2:
version "1.7.3"
resolved "http://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -6091,7 +5517,6 @@ Lockfile:
webpack-dev-middleware "^1.11.0"
yargs "^6.6.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
webpack-sources@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
@@ -6126,8 +5551,6 @@ Lockfile:
webpack-sources "^1.0.1"
yargs "^8.0.2"
-<<<<<<< HEAD
-=======
websocket-driver@>=0.5.1:
version "0.7.0"
resolved "http://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -6139,7 +5562,6 @@ Lockfile:
version "0.1.3"
resolved "http://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
whatwg-fetch@>=0.10.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
@@ -6148,22 +5570,15 @@ Lockfile:
version "0.9.9"
resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-<<<<<<< HEAD
-=======
which-module@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-<<<<<<< HEAD
- which@^1.2.9:
-=======
which@1, which@^1.2.9:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies:
@@ -6210,8 +5625,6 @@ Lockfile:
version "3.0.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-<<<<<<< HEAD
-=======
yargs-parser@^4.2.0:
version "4.2.1"
resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
@@ -6224,15 +5637,12 @@ Lockfile:
dependencies:
camelcase "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
yargs-parser@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
dependencies:
camelcase "^4.1.0"
-<<<<<<< HEAD
-=======
yargs@^6.6.0:
version "6.6.0"
resolved "http://registry.npm.taobao.org/yargs/download/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
@@ -6269,7 +5679,6 @@ Lockfile:
y18n "^3.2.1"
yargs-parser "^5.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
yargs@^8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
diff --git a/yarn.lock b/yarn.lock
index a6c145321a934c823aeb435621f25ab135a2e9a3..b3e796e6e351e50245078abe397e8fc465ee498e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -737,11 +737,7 @@ babel-register@^6.26.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"
-<<<<<<< HEAD
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-=======
babel-runtime@6.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
@@ -2156,13 +2152,6 @@ follow-redirects@^1.0.0:
dependencies:
debug "^3.1.0"
-<<<<<<< HEAD
-font-awesome@^4.7.0:
- version "4.7.0"
- resolved "http://registry.npm.taobao.org/font-awesome/download/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-
-=======
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -2484,8 +2473,6 @@ he@1.1.x:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-<<<<<<< HEAD
-=======
history@^4.7.2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
@@ -2496,7 +2483,6 @@ history@^4.7.2:
value-equal "^0.4.0"
warning "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -2513,13 +2499,10 @@ hoek@4.x.x:
version "4.2.1"
resolved "http://registry.npm.taobao.org/hoek/download/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-<<<<<<< HEAD
-=======
hoist-non-react-statics@^2.3.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
home-or-tmp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -2727,11 +2710,7 @@ interpret@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-<<<<<<< HEAD
-invariant@^2.2.2:
-=======
invariant@^2.2.1, invariant@^2.2.2:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
dependencies:
@@ -3026,8 +3005,6 @@ isstream@~0.1.2:
version "0.1.2"
resolved "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-<<<<<<< HEAD
-=======
jquery@2.x:
version "2.2.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
@@ -3036,7 +3013,6 @@ jquery@~2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.1.4.tgz#228bde698a0c61431dc2630a6a154f15890d2317"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
js-base64@^2.1.8, js-base64@^2.1.9:
version "2.4.3"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
@@ -3232,11 +3208,7 @@ longest@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-<<<<<<< HEAD
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
-=======
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "1.3.1"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
dependencies:
@@ -3899,15 +3871,12 @@ path-to-regexp@0.1.7:
version "0.1.7"
resolved "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-<<<<<<< HEAD
-=======
path-to-regexp@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
dependencies:
isarray "0.0.1"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
path-type@^1.0.0:
version "1.1.0"
resolved "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4251,11 +4220,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-<<<<<<< HEAD
-prop-types@^15.6.0:
-=======
prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.6.0:
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
@@ -4364,8 +4329,6 @@ raw-body@2.3.2:
iconv-lite "0.4.19"
unpipe "1.0.0"
-<<<<<<< HEAD
-=======
rc-pagination@1.15.1:
version "1.15.1"
resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.15.1.tgz#fbf0f88f35d3b34e90bafc068b2bf03b5156ba5f"
@@ -4373,7 +4336,6 @@ rc-pagination@1.15.1:
babel-runtime "6.x"
prop-types "^15.5.7"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
rc@^1.1.7:
version "1.2.6"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
@@ -4392,8 +4354,6 @@ react-dom@16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"
-<<<<<<< HEAD
-=======
react-router-dom@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"
@@ -4417,7 +4377,6 @@ react-router@^4.2.0:
prop-types "^15.5.4"
warning "^3.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
react@16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
@@ -4669,13 +4628,10 @@ resolve-from@^3.0.0:
version "3.0.0"
resolved "http://registry.npm.taobao.org/resolve-from/download/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-<<<<<<< HEAD
-=======
resolve-pathname@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -4882,8 +4838,6 @@ signal-exit@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-<<<<<<< HEAD
-=======
simditor@2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/simditor/-/simditor-2.3.6.tgz#ba71edc3161fc438466c336c9c10052743403947"
@@ -4913,7 +4867,6 @@ simple-uploader@~2.0.7:
jquery "2.x"
simple-module "~2.0.5"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -5503,13 +5456,10 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
-<<<<<<< HEAD
-=======
value-equal@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
vary@~1.1.2:
version "1.1.2"
resolved "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -5532,15 +5482,12 @@ vm-browserify@0.0.4:
dependencies:
indexof "0.0.1"
-<<<<<<< HEAD
-=======
warning@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
dependencies:
loose-envify "^1.0.0"
->>>>>>> 197a6c27a9871167035dc3a85a953615bb7dfca3
watchpack@^1.4.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"