Skip to content

Commit cd92e45

Browse files
committed
enhance config
1 parent c7b7105 commit cd92e45

File tree

9 files changed

+77
-31
lines changed

9 files changed

+77
-31
lines changed

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,18 @@
1717

1818
## Build and Run Locally
1919

20-
```shell
21-
# Install depedencies
22-
npm install
23-
# Build
24-
node build.js (github)
25-
# Run a static server
26-
node server.js
27-
```
28-
2920
Dev:
3021
```shell
31-
node watch.js dev
3222
# should put <https://github.com/ecomfe/echarts-examples> on the same folder with echarts-doc
23+
node watch.js dev
24+
# or
25+
node build.js dev
3326
```
3427

28+
Release:
29+
Check `incubator-echarts-website/README.md` please.
30+
31+
3532
## Build Dash Docset
3633

3734
1. `cd public/documents`

build.js

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,43 @@ var md2json = require('./tool/md2json');
22
var fs = require('fs');
33
var marked = require('marked');
44
var copydir = require('copy-dir');
5-
var MarkDownTOCRenderer = require('./tool/MarkDownTOCRenderer');
5+
// var MarkDownTOCRenderer = require('./tool/MarkDownTOCRenderer');
6+
var argv = require('yargs').argv;
67

7-
var languages = ['cn', 'en'];
8+
/**
9+
* ------------------------------------------------------------------------
10+
* Usage:
11+
*
12+
* ```shell
13+
* ./nodule_modules/.bin/gulp release --env asf
14+
* ./nodule_modules/.bin/gulp release --env echartsjs
15+
* ./nodule_modules/.bin/gulp release --env dev # the same as "debug"
16+
* # Check `./config` to see the available env
17+
* ```
18+
* ------------------------------------------------------------------------
19+
*/
820

9-
var env = process.argv[2] || '';
21+
function initEnv() {
22+
var envType = argv.env;
23+
var isDev = argv.dev != null || argv.debug != null || envType === 'debug';
1024

11-
var configName = './config' + env;
25+
if (isDev) {
26+
console.warn('=============================');
27+
console.warn('!!! THIS IS IN DEV MODE !!!');
28+
console.warn('=============================');
29+
envType = 'dev';
30+
}
1231

13-
var config = require(configName);
32+
if (!envType) {
33+
throw new Error('--env MUST be specified');
34+
}
35+
36+
return require('./config/env.' + envType);
37+
}
38+
39+
var config = initEnv();
40+
41+
var languages = ['cn', 'en'];
1442

1543
config.gl = config.gl || {};
1644
for (var key in config) {
File renamed without changes.
File renamed without changes.

config/env.echartsjs.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
galleryViewPath: 'https://www.echartsjs.com/examples/en/view.html?c=',
3+
galleryEditorPath: 'https://www.echartsjs.com/examples/en/editor.html?c=',
4+
imagePath: 'asset/img/',
5+
6+
gl: {
7+
imagePath: 'asset/gl/img/',
8+
}
9+
};
File renamed without changes.

configen.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"jsdom": "^9.8.3",
1717
"marked": "^0.3.5",
1818
"node-static": "^0.7.7",
19-
"open": "0.0.5"
19+
"open": "0.0.5",
20+
"yargs": "^14.0.0"
2021
}
2122
}

release.sh

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
1+
#!/bin/bash
2+
3+
# ------------------------------------------------------------------------
4+
# Usage:
5+
# sh release.sh --env asf
6+
# sh release.sh --env echartsjs
7+
# sh release.sh --env dev # the same as "debug"
8+
# # Check `./config` to see the available env
9+
# ------------------------------------------------------------------------
10+
11+
while [[ $# -gt 0 ]]; do
12+
case "$1" in
13+
--env) envType="$2"; shift; shift ;;
14+
--env=*) envType="${1#*=}"; shift ;;
15+
*) shift ;;
16+
esac
17+
done
18+
if [[ ! -n "${envType}" ]]; then
19+
echo "--env must be specified."
20+
exit 1;
21+
fi
22+
123
basepath=$(cd `dirname $0`; pwd)
24+
currPath=$(pwd)
225

326

427
# Build cn doc for www.echartsjs.com.
5-
node ${basepath}/build.js
28+
cd ${basepath}
29+
node ./build.js --env ${envType}
30+
cd ${currPath}
631
# Do not rm, keep option3.json.
732
cp -R ${basepath}/public/cn/documents/cn/ ${basepath}/../echarts-www/documents/zh/
8-
cp -R ${basepath}/public/cn/documents/cn/ ${basepath}/../incubator-echarts-website/documents/zh/
9-
10-
node ${basepath}/build.js en
1133
cp -R ${basepath}/public/en/documents/en/ ${basepath}/../echarts-www/documents/en/
12-
cp -R ${basepath}/public/en/documents/en/ ${basepath}/../incubator-echarts-website/documents/en/
13-
1434

1535
# Copy asset.
1636
# Do not rm, keep option3.json

0 commit comments

Comments
 (0)