Skip to content

Commit

Permalink
chore: merge dev/1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
neuqzxy committed Sep 13, 2023
2 parents 7bcd424 + 4e1ebbd commit f48c21e
Show file tree
Hide file tree
Showing 1,338 changed files with 32,101 additions and 16,424 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,14 @@ jobs:

- name: Parse semver version from branch name
id: semver_parser
uses: xile611/read-package-version-action@v2.1
uses: xile611/read-package-version-action@main
with:
path: packages/vchart
semver_string: ${{ github.ref_name }}
semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default

- name: update nextBump of version policies
uses: xile611/set-next-bump-of-rush@main
with:
is_prerelease: true
write_next_bump: true

- name: Apply prereleaseName
run: node common/scripts/install-run-rush.js publish --apply --prerelease-name ${{ steps.semver_parser.outputs.pre_release_name }}
run: node common/scripts/apply-prerelease-version.js ${{ steps.semver_parser.outputs.pre_release_name }} ${{ steps.semver_parser.outputs.main }}

- name: Build packages
run: node common/scripts/install-run-rush.js build --only tag:package
Expand All @@ -68,7 +62,7 @@ jobs:

- name: Get npm version
id: package-version
uses: xile611/read-package-version-action@v2.1
uses: xile611/read-package-version-action@main
with:
path: packages/vchart

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Parse semver version from branch name
id: semver_parser
uses: xile611/read-package-version-action@v2.1
uses: xile611/read-package-version-action@main
with:
path: packages/vchart
semver_string: ${{ github.ref_name }}
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

- name: Get npm version
id: package-version
uses: xile611/read-package-version-action@v2.1
uses: xile611/read-package-version-action@main
with:
path: packages/vchart

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
# Install rush
- name: Install rush
run: node common/scripts/install-run-rush.js install --bypass-policy
- name: Build vutils-extension
run: node common/scripts/install-run-rush.js build --only @visactor/vutils-extension
- name: Build VChart
env:
NODE_OPTIONS: '--max_old_space_size=4096'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,4 @@ packages/wx-vchart/miniprogram/miniprogram_npm/

# generated documents
docs/public/documents
docs/public/vchart/preview/failedPreviewLists.json
6 changes: 6 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"version": "0.1.0",
"configurations": [
{
"name": "Node.js - Debug Current File",
"type": "node",
"request": "launch",
"program": "${file}"
},
{
"name": "generate documents",
"port": 9229,
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ After cloning VChart, run `rush update` to fetch its dependencies. Then, you can
4. `rush test` runs the complete test suite.
5. `rush run -p <project_name> -s <script>` run the specified script for the specified project, eg. `rush run -p @visactor/vchart -s start`
6. `rush prettier --dir <project_relative_path> --ext <file_type>` prettier the specified script for the specified project, eg. `rush prettier --dir packages/vchart --ext ts`

If you want to update documents, you can run `rush docs` to preview VChart document contents locally.
2 changes: 2 additions & 0 deletions CONTRIBUTING.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ VisActor 团队会关注所有的 pull request,我们会 review 以及合并
4. `rush test` 运行所有项目的 test 脚本
5. `rush run -p <project_name> -s <script>` 运行指定项目的指定脚本,eg. `rush run -p @visactor/vchart -s start`
6. `rush prettier --dir <project_relative_path> --ext <file_type>` 格式化指定项目的源代码,eg. `rush prettier --dir packages/vchart --ext ts`

如果你需要更新文档内容,你可以执行 `rush docs` 在本地运行 VChart 的文档内容预览。
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ This repository includes the following packages:
4. [`lark-vchart`](./packages/lark-vchart/): The VChart component encapsulated based on [Lark miniAPP](https://open.feishu.cn/document/client-docs/gadget/introduction/host-environment)
5. [`tt-vchart`](./packages/lark-vchart/): The VChart component encapsulated based on [TikTok miniAPP](https://developer.open-douyin.com/docs/resource/zh-CN/mini-app/introduction/overview/)
6. [`block-vchart`](./packages/block-vchart/): The VChart component encapsulated based on [Lark Block](https://open.feishu.cn/document/client-docs/block/block-introduction)
7. [`docs`](./docs/): VChart site source code, and also contains all Chinese and English documents, chart sample codes, etc. of the site.

## 🔨 Usage

Expand Down Expand Up @@ -129,6 +130,17 @@ $ rush update
$ rush start
# start react-vchart development server
$ rush react
# start site development server
$ rush docs
```

## 📖 Documents

After installation & clone & update, run docs to preview documents locally.

```bash
# start vchart document server
$ rush docs
```

## 🔗 Related Links
Expand Down
12 changes: 12 additions & 0 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ VChart 是 VisActor 可视化体系中的图表组件库,基于可视化语法
4. [`lark-vchart`](./packages/lark-vchart/):基于 [飞书小程序](https://open.feishu.cn/document/client-docs/gadget/introduction/host-environment) 封装的 VChart 图表组件
5. [`tt-vchart`](./packages/lark-vchart/): 基于 [抖音小程序](https://developer.open-douyin.com/docs/resource/zh-CN/mini-app/introduction/overview/) 封装的 VChart 图表组件
6. [`block-vchart`](./packages/block-vchart/):基于 [飞书小组件](https://open.feishu.cn/document/client-docs/block/block-introduction) 封装的 VChart 图表组件
7. [`docs`](./docs/): VChart 站点源码,同时也包含站点所有的中英文文档、图表示例代码等内容。

## 🔨 使用

Expand Down Expand Up @@ -129,6 +130,17 @@ $ rush update
$ rush start
# 开始 react-vchart 的本地开发
$ rush react
# 开始站点的本地开发
$ rush docs
```

## 📖 Documents

安装并且更新依赖后,可以执行 docs 命令,开启 vchart 的本地文档预览

```bash
# start vchart document server
$ rush docs
```

## 🔗 相关链接
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"changes": [
{
"packageName": "@visactor/vchart",
"comment": "fix: fix the problem that the title component clear incompletely.",
"comment": "feat(sequence): add scrollbar layout spec to sequence. close #792",
"type": "none"
}
],
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f48c21e

Please sign in to comment.