Create release for 5.4.1

.eslintrc-common.yaml

@@ -163,7 +163,7 @@ rules:
         - 2
         - "never"
     space-unary-ops: 2
-    spaced-comment: 0
+    spaced-comment: "error"
 
     max-nested-callbacks:
         - 1

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - name: Fetch commit count
@@ -44,7 +44,7 @@ jobs:
       - name: Collect changed files
         run: |
           mkdir ~/tmp/
-          git diff ${{ github.event.pull_request.base.sha }} ${{ github.sha }} --name-only --relative '*src/**/*.ts' > ~/tmp/changed_files
+          git diff ${{ github.event.pull_request.base.sha }} ${{ github.sha }} --diff-filter=ACM --name-only --relative '*src/**/*.ts' > ~/tmp/changed_files
           echo -e "Changed files: \n$(cat ~/tmp/changed_files)"
 
       - name: Lint
@@ -58,7 +58,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/nightly-next.yml

@@ -2,7 +2,7 @@ name: Publish Nightly Next
 
 on:
   schedule:
-    - cron: '0 9 * * *' # After zrender nightly published
+    - cron: '10 9 * * *' # After zrender nightly published
   # committers can manually trigger with workflow_dispatch
   workflow_dispatch: {}
   repository_dispatch:
@@ -15,24 +15,27 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: next
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           registry-url: https://registry.npmjs.org/
       - name: Setup and publish nightly
         run: |
+          node build/nightly/prepare.js --next
+          npm i zrender@npm:zrender-nightly@next
           npm ci
+          npm ls zrender
+          node build/nightly/post.js
           npm run release
           npm run test
           npm run test:dts
-          node build/prepareNightly.js --next
           npm publish --tag next
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/nightly.yml

@@ -15,21 +15,24 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           registry-url: https://registry.npmjs.org/
       - name: Setup and publish nightly
         run: |
+          node build/nightly/prepare.js
+          npm i zrender@npm:zrender-nightly
           npm ci
+          npm ls zrender
+          node build/nightly/post.js
           npm run release
           npm run test
           npm run test:dts
-          node build/prepareNightly.js
           npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/source-release.yml

@@ -11,13 +11,13 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -26,15 +26,15 @@ jobs:
           echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ~/.npm
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
 
-      - name: Prepare releaes materials
+      - name: Prepare release materials
         run: |
           npm i
           node build/source-release/prepareReleaseMaterials.js \
@@ -44,7 +44,7 @@ jobs:
             --out tmp/materials
 
       - name: Archive materials
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
           path: |
@@ -56,13 +56,13 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -72,15 +72,15 @@ jobs:
 
       # Get RELEASE_NOTE.txt and pack it into zip.
       - name: Download materials
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
 
       # TODO Check release version is RC
 
       # Archive before run others to avoid packing unknown files.
       - name: Archive source release
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-src
           path: |
@@ -109,11 +109,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -122,7 +122,7 @@ jobs:
           echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Download source release
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: apache-echarts-${{env.RELEASE_VERSION}}-src
           path: tmp/echarts

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.repository_owner == 'apache' }}
     steps:
       - name: Close Stale Issues
-        uses: actions/stale@v5
+        uses: actions/stale@v6
         with:
           days-before-stale: 730
           days-before-close: 7
@@ -26,5 +26,6 @@ jobs:
           stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. If you wish not to mark it as stale, please leave a comment in this PR. We are sorry for this but 2 years is a long time and the code base has been changed a lot. Thanks for your contribution anyway.'
           close-pr-message: 'This PR has been automatically closed because it has not had recent activity. Sorry for that and we are looking forward to your next contribution.'
           exempt-issue-labels: 'FAQ,priority: high'
+          exempt-all-milestones: true
           operations-per-run: 500
           ascending: true

.huskyrc

@@ -1,5 +1,5 @@
 {
   "hooks": {
-    "pre-commit": "npm run lint && npm run checktype",
+    "pre-commit": "npm run lint && npm run checktype"
   }
 }

README.md

@@ -45,6 +45,9 @@ Execute the instructions in the root directory of the echarts:
 npm install
 
 # Rebuild source code immediately in watch mode when changing the source code.
+# It opens the `./test` directory and you may open `-cases.html` to get the list
+# of all test cases.
+# If you wish to create a test case, run `npm run mktest:help` to learn more.
 npm run dev
 
 # Check correctness of TypeScript code.

src/chart/boxplot/boxplotVisual.ts → build/nightly/post.js

@@ -17,10 +17,14 @@
 * under the License.
 */
 
-import GlobalModel from '../../model/Global';
-import ExtensionAPI from '../../core/ExtensionAPI';
-import BoxplotSeriesModel from './BoxplotSeries';
+const fs = require('fs');
 
-export default function boxplotVisual(ecModel: GlobalModel, api: ExtensionAPI) {
+const root = __dirname + '/../../';
+const echartsPkg = JSON.parse(fs.readFileSync(root + 'package.json'), 'utf-8');
+const zrenderPkg = JSON.parse(fs.readFileSync(root + 'node_modules/zrender/package.json', 'utf-8'));
 
-}
+const echartsCorePath = root + 'src/core/echarts.ts';
+const echartsCoreFile = fs.readFileSync(echartsCorePath, 'utf-8')
+    .replace(/export const version = '\S+'/, `export const version = '${echartsPkg.version}'`)
+    .replace(/(export const dependencies = {\s+zrender: ')\S+('\s+})/, `$1${zrenderPkg.version}$2`);
+fs.writeFileSync(echartsCorePath, echartsCoreFile, 'utf-8');

build/prepareNightly.js → build/nightly/prepare.js

@@ -19,7 +19,7 @@
 
 
 const fs = require('fs');
-const packageJsonPath = __dirname + '/../package.json';
+const packageJsonPath = __dirname + '/../../package.json';
 const nightlyPackageName = 'echarts-nightly';
 
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
@@ -57,8 +57,7 @@ packageJson.version = updateVersion(packageJson.version);
 
 fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf-8');
 
-
-const readmePath = __dirname + '/../README.md';
+const readmePath = __dirname + '/../../README.md';
 const readmeAttention = `<h3>
 <p><em>⚠️ ATTENTION PLEASE</em></p>
 <p><em>This is nightly build of Apache ECharts. Please DON't use it in your production environment.</em></p>
@@ -70,4 +69,4 @@ ${readmeAttention}
 
 ${readmeContent}
 `, 'utf-8');
-}
+}

extension-src/bmap/BMapModel.ts

@@ -48,10 +48,10 @@ export default echarts.extendComponentModel({
 
         zoom: 5,
 
-        // 2.0 http://lbsyun.baidu.com/custom/index.htm
+        // 2.0 https://lbsyun.baidu.com/custom/index.htm
         mapStyle: {},
 
-        // 3.0 http://lbsyun.baidu.com/index.php?title=open/custom
+        // 3.0 https://lbsyun.baidu.com/index.php?title=open/custom
         mapStyleV2: {},
 
         // See https://lbsyun.baidu.com/cms/jsapi/reference/jsapi_reference.html#a0b1

extension-src/bmap/README.md

@@ -1,6 +1,6 @@
 ## 百度地图扩展
 
-ECharts 百度地图扩展，可以在百度地图上展现 [点图](https://echarts.apache.org/zh/option.html#series-scatter)，[线图](https://echarts.apache.org/zh/option.html#series-line)，[热力图](https://echarts.apache.org/zh/option.html#series-heatmap) 等可视化。
+ECharts 百度地图扩展，可以在百度地图上展现 [点图](https://echarts.apache.org/zh/option.html#series-scatter)，[线图](https://echarts.apache.org/zh/option.html#series-lines)，[热力图](https://echarts.apache.org/zh/option.html#series-heatmap) 等可视化。
 
 
 ### 示例
@@ -11,18 +11,19 @@ ECharts 百度地图扩展，可以在百度地图上展现 [点图](https://ech
 
 [北京公交路线特效](https://echarts.apache.org/examples/zh/editor.html?c=lines-bmap-effect)
 
-[北京公交路线特效](https://echarts.apache.org/examples/zh/editor.html?c=lines-bmap-effect)
-
 [杭州热门步行路线](https://echarts.apache.org/examples/zh/editor.html?c=heatmap-bmap)
 
+[在地图上显示分箱图](https://echarts.apache.org/examples/zh/editor.html?c=map-bin)
+
 
 ### 引入
 
 可以直接引入打包好的扩展文件和百度地图的 jssdk
 
 ```html
-<!--引入百度地图的jssdk，这里需要使用你在百度地图开发者平台申请的 ak-->
-<script src="http://api.map.baidu.com/api?v=2.0&ak="></script>
+<!-- 引入百度地图的 JS SDK，这里需要使用你在百度地图开发者平台申请的 ak -->
+<!-- 如需使用百度地图 2.0 版本，请将 `v=3.0` 改为 `v=2.0` -->
+<script src="https://api.map.baidu.com/api?v=3.0&ak="></script>
 <!-- 引入 ECharts -->
 <script src="dist/echarts.min.js"></script>
 <!-- 引入百度地图扩展 -->
@@ -46,21 +47,32 @@ require('echarts/extension/bmap/bmap');
 option = {
     // 加载 bmap 组件
     bmap: {
-        // 百度地图中心经纬度
+        // 百度地图中心经纬度。默认为 [104.114129, 37.550339]。
         center: [120.13066322374, 30.240018034923],
-        // 百度地图缩放
+        // 百度地图缩放级别。默认为 5。
         zoom: 14,
-        // 是否开启拖拽缩放，可以只设置 'scale' 或者 'move'
+        // 是否开启拖拽缩放，可以只设置 'scale' 或者 'move'。默认关闭。
         roam: true,
-        // 百度地图的自定义样式，见 http://developer.baidu.com/map/jsdevelop-11.htm
-        mapStyle: {}
+        // 百度地图的旧版自定义样式，见 https://lbsyun.baidu.com/custom/index.htm
+        mapStyle: {},
+        // 百度地图 3.0 之后的新版自定义样式，见 https://lbsyun.baidu.com/index.php?title=open/custom
+        mapStyleV2: {},
+        // 百度地图的初始化配置，见 https://lbsyun.baidu.com/cms/jsapi/reference/jsapi_reference.html#a0b1
+        mapOptions: {
+            // 禁用百度地图自带的底图可点功能
+            enableMapClick: false
+        }
     },
     series: [{
         type: 'scatter',
         // 使用百度地图坐标系
         coordinateSystem: 'bmap',
         // 数据格式跟在 geo 坐标系上一样，每一项都是 [经度，纬度，数值大小，其它维度...]
-        data: [ [120, 30, 1] ]
+        data: [ [120, 30, 1] ],
+        // 编码数据项中第三个元素作为 value 维度
+        encode: {
+            value: 2
+        }
     }]
 }
 

i18n/langUA.js → i18n/langUK.js

@@ -165,6 +165,6 @@ var localeObj = {
     }
 };
 
-    echarts.registerLocale('UA', localeObj);
+    echarts.registerLocale('UK', localeObj);
 
 });