[kylin] branch master updated: KYLIN-5003 Remove legacy front end dependencies

[xx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new c6b00a5   KYLIN-5003 Remove legacy front end dependencies
c6b00a5 is described below

commit c6b00a5bd70ff6a90825ca14def1ffd46820108f
Author: nic <ni...@apache.org>
AuthorDate: Tue Jun 1 21:55:17 2021 +0800

     KYLIN-5003 Remove legacy front end dependencies
---
 build/script/build.sh | 1 +
 webapp/bower.json     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/script/build.sh b/build/script/build.sh
index 458c612..2c38f2e 100755
--- a/build/script/build.sh
+++ b/build/script/build.sh
@@ -31,4 +31,5 @@ npm install -g bower			 || { exit 1; }
 bower --allow-root install		 || { exit 1; }
 npm install						 || { exit 1; }
 npm install -g grunt-cli		 || { exit 1; }
+PHANTOMJS_CDNURL=https://npm.taobao.org/mirrors/phantomjs npm install phantomjs-prebuilt || { exit 1; }
 grunt dev --buildEnv=dev --buildNumber=`date "+%Y%m%d%H%M%S"`  || { exit 1; }
diff --git a/webapp/bower.json b/webapp/bower.json
index bb05f3b..3f2705c 100755
--- a/webapp/bower.json
+++ b/webapp/bower.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "less.js": "~1.4.0",
-    "angular-mocks-unstable": "~1.1.5"
+    "angular-mocks": "~1.2.0"
   },
   "resolutions": {
     "angular": "1.2.29",