You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2020/11/03 10:05:20 UTC
[incubator-echarts-handbook] branch master updated: (WIP)chore:
generate script
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new b8c960d (WIP)chore: generate script
b8c960d is described below
commit b8c960d38b2ff29bde33e740706af6f855a77bf1
Author: Ovilia <zw...@gmail.com>
AuthorDate: Tue Nov 3 18:05:04 2020 +0800
(WIP)chore: generate script
---
build/generate.js | 61 +++++++++++++++++++++++++++++++++++++++
components/partials/Navigator.vue | 40 ++-----------------------
configs/config.asf.js | 2 +-
nuxt.config.js | 3 ++
package-lock.json | 11 +++++--
package.json | 1 +
pages/helper/contributors.ts | 14 ++++++---
7 files changed, 87 insertions(+), 45 deletions(-)
diff --git a/build/generate.js b/build/generate.js
new file mode 100644
index 0000000..d4d1f48
--- /dev/null
+++ b/build/generate.js
@@ -0,0 +1,61 @@
+const {exec} = require('child_process');
+const fs = require('fs');
+
+console.log('[1/2] Running nuxt generate');
+exec('nuxt generate', (error, stdout, stderr) => {
+ if (error) {
+ console.error(error);
+ }
+ if (stderr) {
+ console.error(stderr);
+ }
+ if (stdout) {
+ console.log(stdout);
+ }
+
+ console.log('[2/2] Updating nav.');
+ setNav();
+});
+
+function setNav() {
+ try {
+ const navContent = fs.readFileSync('../incubator-echarts-website/components/nav.html', 'utf-8');
+ setNavDir('./dist', navContent);
+ }
+ catch (e) {
+ console.error(e);
+ console.error('Setting nav failed due to the error loading nav.html. Please make sure you have incubator-echarts-www and incubator-echarts-website project being under the same directory of this repo and have run `npm run build` under incubator-echarts-www.');
+ }
+}
+
+function setNavDir(path, navContent) {
+ let isDir;
+ try {
+ isDir = fs.lstatSync(path).isDirectory();
+ }
+ catch (e) {
+ console.warn('File not found, ignored:', path);
+ return;
+ }
+
+ if (isDir) {
+ const files = fs.readdirSync(path);
+ files.forEach(file => setNavDir(path + '/' + file, navContent));
+ }
+ else {
+ try {
+ let content = fs.readFileSync(path, 'utf-8');
+ if (content) {
+ content = content.replace(
+ '<div id="nav-placeholder">INJECT NAV HERE</div>',
+ navContent
+ );
+ fs.writeFileSync(path, content, 'utf-8');
+ }
+ }
+ catch (e) {
+ console.error('Error:', e);
+ }
+
+ }
+}
diff --git a/components/partials/Navigator.vue b/components/partials/Navigator.vue
index 426dd0d..f7b29ec 100644
--- a/components/partials/Navigator.vue
+++ b/components/partials/Navigator.vue
@@ -1,42 +1,8 @@
<template>
- <!-- tmp nav -->
- <div>
- <nav>
- <img src="http://localhost/incubator-echarts-website/zh/images/logo.png">
-
- <div class="nav-btn">首页</div>
- <div class="nav-btn">下载</div>
- <div class="nav-btn">实例</div>
- <div class="nav-btn">社区</div>
- <div class="nav-btn">工具</div>
- <div class="nav-btn">贡献</div>
- <div class="nav-btn">关于</div>
- </nav>
- </div>
+ <div id="nav-placeholder">INJECT NAV HERE</div>
</template>
<style>
-
-nav {
- width: 100%;
- height: 50px;
- background-color: #293c55;
+#nav-placeholder {
+ display: none;
}
-
-.nav-btn {
- color: rgba(255,255,255,0.45);
- display: inline-block;
- padding: 13px 20px;
- margin-left: 5px;
- font-size: 14px;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Microsoft YaHei", "Hiragino Sans GB", "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-nav img {
- float: left;
- height: 50px;
- padding: 12px 12px;
- font-size: 18px;
- line-height: 20px;
-}
-
</style>
diff --git a/configs/config.asf.js b/configs/config.asf.js
index a441c77..0ba1640 100644
--- a/configs/config.asf.js
+++ b/configs/config.asf.js
@@ -1,5 +1,5 @@
export default {
- rootPath: '/echarts-handbook/dist',
+ rootPath: ' http://127.0.0.1:8080/',
galleryViewPath: 'https://echarts.apache.org/examples/zh/view.html?c=',
mainSitePath: 'https://echarts.apache.org/',
optionPath: 'https://echarts.apache.org/option.html#',
diff --git a/nuxt.config.js b/nuxt.config.js
index 7c88d57..4f8eb89 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -77,6 +77,9 @@ export default {
** Build configuration
*/
build: {
+ extractCSS: {
+ allChunks: true
+ },
/*
** You can extend webpack config here
*/
diff --git a/package-lock.json b/package-lock.json
index d7fbe40..1fb7f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3377,6 +3377,12 @@
"resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
"integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
},
+ "child_process": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
+ "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o=",
+ "dev": true
+ },
"chokidar": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
@@ -7998,9 +8004,8 @@
}
},
"markdown-it-toc-done-right": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.1.0.tgz",
- "integrity": "sha512-UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw=="
+ "version": "git+ssh://git@github.com/Ovilia/markdown-it-toc-done-right.git#15afef001701efb604604dd1dcaa22a2fd753f34",
+ "from": "git+ssh://git@github.com/Ovilia/markdown-it-toc-done-right.git"
},
"md5.js": {
"version": "1.3.5",
diff --git a/package.json b/package.json
index 563ffea..974ce67 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"@nuxtjs/eslint-config-typescript": "^1.0.0",
"@nuxtjs/eslint-module": "^1.0.0",
"babel-eslint": "^10.0.1",
+ "child_process": "^1.0.2",
"eslint": "^6.1.0",
"eslint-plugin-nuxt": ">=0.4.2",
"file-loader": "^6.0.0",
diff --git a/pages/helper/contributors.ts b/pages/helper/contributors.ts
index 6145f15..fc345b9 100644
--- a/pages/helper/contributors.ts
+++ b/pages/helper/contributors.ts
@@ -24,7 +24,7 @@ export default {
],
"contents/zh/concepts/dataset.md": [
"100pah",
- "huanghan01"
+ "Ovilia\t\nhuanghan01"
],
"contents/zh/concepts/coordinate.md": [
"Ovilia"
@@ -113,6 +113,7 @@ export default {
"Ovilia"
],
"contents/zh/application/data/dynamic-data.md": [
+ "Ovilia",
"pissang"
],
"contents/zh/application/data/drilldown.md": [
@@ -201,9 +202,11 @@ export default {
"huanghan01"
],
"contents/en/concepts/event.md": [
+ "Ovilia",
"huanghan01"
],
"contents/en/concepts/dataset.md": [
+ "Ovilia",
"huanghan01"
],
"contents/en/concepts/coordinate.md": [
@@ -261,16 +264,19 @@ export default {
"Hansz00"
],
"contents/en/best-practice/canvas-vs-svg.md": [
- "Hansz00"
+ "Hansz00",
+ "Ovilia"
],
"contents/en/best-practice/aria.md": [
- "Hansz00"
+ "Hansz00",
+ "Ovilia"
],
"contents/en/bar.md": [
"Ovilia"
],
"contents/en/application/data/dynamic-data.md": [
- "Hansz00"
+ "Hansz00",
+ "Ovilia"
],
"contents/en/application/data/drilldown.md": [
"Hansz00"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org