[echarts-www] branch master updated: build handbook after build pages.

[sh...@apache.org]

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

shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-www.git


The following commit(s) were added to refs/heads/master by this push:
     new dcd269c  build handbook after build pages.
dcd269c is described below

commit dcd269c9536598e3be8b3e83133f9e58f0c0dae4
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Sep 1 19:32:12 2021 +0800

    build handbook after build pages.
---
 _jade/components/nav-mixin.jade |  1 -
 _jade/en/nav-mixin.jade         |  1 -
 bin/release.sh                  | 34 ++++++++++++----------------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/_jade/components/nav-mixin.jade b/_jade/components/nav-mixin.jade
index 988c3cb..7ccbdf2 100644
--- a/_jade/components/nav-mixin.jade
+++ b/_jade/components/nav-mixin.jade
@@ -31,7 +31,6 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
                             a(href='#{hostParam}/zh/faq.html') 常见问题
                         li
                             a(href='#{hostParam}/handbook/zh/basics/release-note/v5-upgrade-guide') v5 升级指南
-                                span.new new
                 li#nav-download.dropdown
                     a(href='#', class="dropdown-toggle", data-toggle="dropdown") 下载
                         b.caret
diff --git a/_jade/en/nav-mixin.jade b/_jade/en/nav-mixin.jade
index c104826..587b55d 100644
--- a/_jade/en/nav-mixin.jade
+++ b/_jade/en/nav-mixin.jade
@@ -31,7 +31,6 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
                             a(href='#{hostParam}/en/faq.html') FAQ
                         li
                             a(href='#{hostParam}/handbook/en/basics/release-note/v5-upgrade-guide') V5 Upgrade Guide
-                                span.new new
                 li#nav-download.dropdown
                     a(href='#', class="dropdown-toggle", data-toggle="dropdown") Download
                         b.caret
diff --git a/bin/release.sh b/bin/release.sh
index c3c7eb4..7f1623b 100644
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -74,18 +74,6 @@ npm run release
 cd ${currWorkingDir}
 echo "Build examples done."
 
-# Build handbook
-echo "Build handbook ..."
-if [ ! -d "${handbookProjectDir}" ]; then
-    echo "Directory ${handbookProjectDir} DOES NOT exists."
-    exit 1
-fi
-cd ${handbookProjectDir}
-npm run build:${envType}
-rm -rf ${websiteTargetDir}/handbook
-cp -R ${handbookProjectDir}/dist ${websiteTargetDir}/handbook
-echo "Build handbook done."
-
 # Build SPA pages.
 cd ${thisScriptDir}
 node releasePages.js
@@ -97,16 +85,18 @@ node bin/build.js --env ${envType}
 cd ${currWorkingDir}
 echo "Build www done."
 
-
-if [[ "${envType}" = "echartsjs" ]]; then
-    cd ${wwwProjectDir}
-    echo "zip echarts-www.zip ..."
-    if [ -f echarts-www.zip ]; then
-        rm echarts-www.zip
-    fi
-    zip -r -q echarts-www.zip release
-    echo "zip echarts-www.zip done."
-    cd ${currWorkingDir}
+# Build handbook after www page build.
+# handbook needs fetch nav page.
+echo "Build handbook ..."
+if [ ! -d "${handbookProjectDir}" ]; then
+    echo "Directory ${handbookProjectDir} DOES NOT exists."
+    exit 1
 fi
+cd ${handbookProjectDir}
+npm run build:${envType}
+rm -rf ${websiteTargetDir}/handbook
+cp -R ${handbookProjectDir}/dist ${websiteTargetDir}/handbook
+echo "Build handbook done."
+
 
 echo "echarts-www release done for ${envType}"

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org