From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
yarn.lock | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 7132ee2..1484f9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -235,10 +235,6 @@
version "0.6.1"
resolved "http://registry.npm.taobao.org/@delon/cache/download/@delon/cache-0.6.1.tgz#13b412897743dc2ad612c4c4fca280c3dc044825"
-"@delon/mock@0.6.1":
- version "0.6.1"
- resolved "http://registry.npm.taobao.org/@delon/mock/download/@delon/mock-0.6.1.tgz#e52bbdd708ff83680c985d0aa4ace282168de873"
-
"@delon/theme@0.6.1":
version "0.6.1"
resolved "http://registry.npm.taobao.org/@delon/theme/download/@delon/theme-0.6.1.tgz#4e98b1dc565c2f0684717c44ed73509cd866f120"
@@ -2176,6 +2172,12 @@
resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
dependencies:
jsbn "~0.1.0"
+
+echarts@^3.8.5:
+ version "3.8.5"
+ resolved "https://registry.yarnpkg.com/echarts/-/echarts-3.8.5.tgz#58e4a51d2743c6fb75257b0dc0a9cf9f5378ac0e"
+ dependencies:
+ zrender "3.7.4"
ee-first@1.1.1:
version "1.1.1"
@@ -7864,9 +7866,9 @@
semver "^5.3.0"
xml2js "^0.4.17"
-webpack-bundle-analyzer@^2.9.0:
+webpack-bundle-analyzer@^2.9.2:
version "2.9.2"
- resolved "http://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
+ resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
dependencies:
acorn "^5.1.1"
chalk "^1.1.3"
@@ -8253,3 +8255,7 @@
zone.js@^0.8.14, zone.js@^0.8.18:
version "0.8.19"
resolved "http://registry.npm.taobao.org/zone.js/download/zone.js-0.8.19.tgz#a4b522cd9e8b7b616a638c297d720d4c7f292f71"
+
+zrender@3.7.4:
+ version "3.7.4"
+ resolved "https://registry.yarnpkg.com/zrender/-/zrender-3.7.4.tgz#f847d53948481ef6d42906d1ea9aeec7acbefdf2"
--
Gitblit v1.8.0