Skip to content

Commit 3fdeb4d

Browse files
committed
Merge branch main into feat/symLog-ticks
2 parents 450d912 + 202a840 commit 3fdeb4d

33 files changed

+1044
-370
lines changed

.github/workflows/pre-release.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ jobs:
3636
id: semver_parser
3737
uses: xile611/read-package-version-action@main
3838
with:
39+
path: packages/vutils
3940
semver_string: ${{ github.ref_name }}
4041
semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default
41-
use_current_version: false # don't read package.json
42+
43+
- name: update nextBump of version policies
44+
uses: xile611/set-next-bump-of-rush@main
45+
with:
46+
is_prerelease: true
47+
write_next_bump: true
4248

4349
- name: Apply prereleaseName
4450
run: node common/scripts/install-run-rush.js publish --apply --prerelease-name ${{ steps.semver_parser.outputs.pre_release_name }} --partial-prerelease
@@ -55,10 +61,16 @@ jobs:
5561
- name: Update shrinkwrap
5662
run: node common/scripts/install-run-rush.js update
5763

64+
- name: Get npm version
65+
id: package-version
66+
uses: xile611/[email protected]
67+
with:
68+
path: packages/vutils
69+
5870
- name: Commit & Push changes
5971
uses: actions-js/push@master
6072
with:
6173
github_token: ${{ secrets.GITHUB_TOKEN }}
62-
message: 'build: prelease version ${{ steps.semver_parser.outputs.current_version }}'
74+
message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}'
6375
branch: ${{ github.ref_name }}
6476
author_name: ${{ github.actor }}

.github/workflows/release.yml

+20-8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@ jobs:
3434
- name: Install rush
3535
run: node common/scripts/install-run-rush.js install --bypass-policy
3636

37+
- name: Parse semver version from branch name
38+
id: semver_parser
39+
uses: xile611/[email protected]
40+
with:
41+
path: packages/vutils
42+
semver_string: ${{ github.ref_name }}
43+
semver_pattern: '^release/(.*)$' # ^v?(.*)$ by default
44+
45+
- name: update nextBump of version policies
46+
uses: xile611/set-next-bump-of-rush@main
47+
with:
48+
release_version: ${{ steps.semver_parser.outputs.full }}
49+
write_next_bump: true
50+
3751
- name: Update version
3852
run: node common/scripts/install-run-rush.js version --bump
3953

@@ -50,33 +64,31 @@ jobs:
5064
run: node common/scripts/install-run-rush.js update
5165

5266
- name: Parse semver version from branch name
53-
id: semver_parser
67+
id: package-version
5468
uses: xile611/read-package-version-action@main
5569
with:
56-
semver_string: ${{ github.ref_name }}
57-
semver_pattern: '^release/(.*)$' # ^v?(.*)$ by default
58-
use_current_version: false # don't read package.json
70+
path: packages/vutils
5971

6072
- name: Commit & Push changes
6173
uses: actions-js/push@master
6274
with:
6375
github_token: ${{ secrets.GITHUB_TOKEN }}
64-
message: 'build: prelease version ${{ steps.semver_parser.outputs.current_version }}'
76+
message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}'
6577
branch: ${{ github.ref_name }}
6678

6779
- name: Collect changelog of rush
6880
uses: xile611/collect-rush-changlog@main
6981
id: changelog
7082
with:
71-
version: ${{ steps.semver_parser.outputs.current_version }}
83+
version: ${{ steps.package-version.outputs.current_version }}
7284

7385
- name: Create Release for Tag
7486
id: release_tag
7587
uses: ncipollo/[email protected]
7688
env:
7789
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7890
with:
79-
tag: v${{ steps.semver_parser.outputs.current_version }}
91+
tag: v${{ steps.package-version.outputs.current_version }}
8092
commit: main
8193
prerelease: false
8294
body: |
@@ -87,7 +99,7 @@ jobs:
8799
uses: dustinirving/[email protected]
88100
with:
89101
token: ${{ secrets.GITHUB_TOKEN }}
90-
title: '[Auto release] release ${{ steps.semver_parser.outputs.current_version }}'
102+
title: '[Auto release] release ${{ steps.package-version.outputs.current_version }}'
91103
base: main
92104
head: ${{ github.ref_name }}
93105
labels: release # default labels, the action will throw error if not specified

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<div align="center">
2-
<a href="" target="_blank">
3-
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/500_200.svg"/>
2+
<a href="https://github.com/VisActor#gh-light-mode-only" target="_blank">
3+
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/logo_500_200_light.svg"/>
4+
</a>
5+
<a href="https://github.com/VisActor#gh-dark-mode-only" target="_blank">
6+
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/logo_500_200_dark.svg"/>
47
</a>
58
</div>
69

README.zh-CN.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<div align="center">
2-
<a href="" target="_blank">
3-
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/500_200.svg"/>
2+
<a href="https://github.com/VisActor#gh-light-mode-only" target="_blank">
3+
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/logo_500_200_light.svg"/>
4+
</a>
5+
<a href="https://github.com/VisActor#gh-dark-mode-only" target="_blank">
6+
<img alt="VisActor Logo" width="200" src="https://github.com/VisActor/.github/blob/main/profile/logo_500_200_dark.svg"/>
47
</a>
58
</div>
69

common/changes/@visactor/vscale/feat-optimize-ticks_2023-08-02-09-02.json

-10
This file was deleted.

common/config/rush/pnpm-lock.yaml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+1-101
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,2 @@
1-
/**
2-
* This is configuration file is used for advanced publishing configurations with Rush.
3-
* More documentation is available on the Rush website: https://rushjs.io
4-
*/
1+
[{"definitionName":"lockStepVersion","policyName":"vutilMain","version":"0.15.7","nextBump":"patch"}]
52

6-
/**
7-
* A list of version policy definitions. A "version policy" is a custom package versioning
8-
* strategy that affects "rush change", "rush version", and "rush publish". The strategy applies
9-
* to a set of projects that are specified using the "versionPolicyName" field in rush.json.
10-
*/
11-
[
12-
// {
13-
// /**
14-
// * (Required) Indicates the kind of version policy being defined ("lockStepVersion" or "individualVersion").
15-
// *
16-
// * The "lockStepVersion" mode specifies that the projects will use "lock-step versioning". This
17-
// * strategy is appropriate for a set of packages that act as selectable components of a
18-
// * unified product. The entire set of packages are always published together, and always share
19-
// * the same NPM version number. When the packages depend on other packages in the set, the
20-
// * SemVer range is usually restricted to a single version.
21-
// */
22-
// "definitionName": "lockStepVersion",
23-
//
24-
// /**
25-
// * (Required) The name that will be used for the "versionPolicyName" field in rush.json.
26-
// * This name is also used command-line parameters such as "--version-policy"
27-
// * and "--to-version-policy".
28-
// */
29-
// "policyName": "MyBigFramework",
30-
//
31-
// /**
32-
// * (Required) The current version. All packages belonging to the set should have this version
33-
// * in the current branch. When bumping versions, Rush uses this to determine the next version.
34-
// * (The "version" field in package.json is NOT considered.)
35-
// */
36-
// "version": "1.0.0",
37-
//
38-
// /**
39-
// * (Required) The type of bump that will be performed when publishing the next release.
40-
// * When creating a release branch in Git, this field should be updated according to the
41-
// * type of release.
42-
// *
43-
// * Valid values are: "prerelease", "release", "minor", "patch", "major"
44-
// */
45-
// "nextBump": "prerelease",
46-
//
47-
// /**
48-
// * (Optional) If specified, all packages in the set share a common CHANGELOG.md file.
49-
// * This file is stored with the specified "main" project, which must be a member of the set.
50-
// *
51-
// * If this field is omitted, then a separate CHANGELOG.md file will be maintained for each
52-
// * package in the set.
53-
// */
54-
// "mainProject": "my-app",
55-
//
56-
// /**
57-
// * (Optional) If enabled, the "rush change" command will prompt the user for their email address
58-
// * and include it in the JSON change files. If an organization maintains multiple repos, tracking
59-
// * this contact information may be useful for a service that automatically upgrades packages and
60-
// * needs to notify engineers whose change may be responsible for a downstream build break. It might
61-
// * also be useful for crediting contributors. Rush itself does not do anything with the collected
62-
// * email addresses. The default value is "false".
63-
// */
64-
// // "includeEmailInChangeFile": true
65-
// },
66-
//
67-
// {
68-
// /**
69-
// * (Required) Indicates the kind of version policy being defined ("lockStepVersion" or "individualVersion").
70-
// *
71-
// * The "individualVersion" mode specifies that the projects will use "individual versioning".
72-
// * This is the typical NPM model where each package has an independent version number
73-
// * and CHANGELOG.md file. Although a single CI definition is responsible for publishing the
74-
// * packages, they otherwise don't have any special relationship. The version bumping will
75-
// * depend on how developers answer the "rush change" questions for each package that
76-
// * is changed.
77-
// */
78-
// "definitionName": "individualVersion",
79-
//
80-
// "policyName": "MyRandomLibraries",
81-
//
82-
// /**
83-
// * (Optional) This can be used to enforce that all packages in the set must share a common
84-
// * major version number, e.g. because they are from the same major release branch.
85-
// * It can also be used to discourage people from accidentally making "MAJOR" SemVer changes
86-
// * inappropriately. The minor/patch version parts will be bumped independently according
87-
// * to the types of changes made to each project, according to the "rush change" command.
88-
// */
89-
// "lockedMajor": 3,
90-
//
91-
// /**
92-
// * (Optional) When publishing is managed by Rush, by default the "rush change" command will
93-
// * request changes for any projects that are modified by a pull request. These change entries
94-
// * will produce a CHANGELOG.md file. If you author your CHANGELOG.md manually or announce updates
95-
// * in some other way, set "exemptFromRushChange" to true to tell "rush change" to ignore the projects
96-
// * belonging to this version policy.
97-
// */
98-
// "exemptFromRushChange": false,
99-
//
100-
// // "includeEmailInChangeFile": true
101-
// }
102-
]

packages/vdataset/CHANGELOG.json

+84
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,90 @@
11
{
22
"name": "@visactor/vdataset",
33
"entries": [
4+
{
5+
"version": "0.15.7",
6+
"tag": "@visactor/vdataset_v0.15.7",
7+
"date": "Wed, 16 Aug 2023 04:17:45 GMT",
8+
"comments": {
9+
"none": [
10+
{
11+
"comment": "fix: fix the error when parseOption is nill\n\n"
12+
}
13+
]
14+
}
15+
},
16+
{
17+
"version": "0.15.6",
18+
"tag": "@visactor/vdataset_v0.15.6",
19+
"date": "Wed, 16 Aug 2023 03:11:05 GMT",
20+
"comments": {
21+
"none": [
22+
{
23+
"comment": "fix: fix the problem that the effect of clone configuration in dataview.parserOption is incorrect\n\n"
24+
}
25+
]
26+
}
27+
},
28+
{
29+
"version": "0.15.5",
30+
"tag": "@visactor/vdataset_v0.15.5",
31+
"date": "Fri, 11 Aug 2023 08:33:53 GMT",
32+
"comments": {
33+
"none": [
34+
{
35+
"comment": "fix(fields): fix when the fields are sorted, the domain index does not correspond to the order in which the data appears\n\n"
36+
}
37+
]
38+
}
39+
},
40+
{
41+
"version": "0.15.4",
42+
"tag": "@visactor/vdataset_v0.15.4",
43+
"date": "Thu, 10 Aug 2023 12:06:21 GMT",
44+
"comments": {
45+
"none": [
46+
{
47+
"comment": "fix(fields): fix the bug of when unset option to get fields\n\n"
48+
}
49+
]
50+
}
51+
},
52+
{
53+
"version": "0.15.3",
54+
"tag": "@visactor/vdataset_v0.15.3",
55+
"date": "Thu, 10 Aug 2023 09:49:35 GMT",
56+
"comments": {
57+
"none": [
58+
{
59+
"comment": "feat(dataview): support setFields in dataView, details in #62\n\n"
60+
}
61+
]
62+
}
63+
},
64+
{
65+
"version": "0.15.2",
66+
"tag": "@visactor/vdataset_v0.15.2",
67+
"date": "Mon, 07 Aug 2023 06:37:52 GMT",
68+
"comments": {}
69+
},
70+
{
71+
"version": "0.15.1",
72+
"tag": "@visactor/vdataset_v0.15.1",
73+
"date": "Mon, 07 Aug 2023 06:27:29 GMT",
74+
"comments": {}
75+
},
76+
{
77+
"version": "0.15.0",
78+
"tag": "@visactor/vdataset_v0.15.0",
79+
"date": "Mon, 07 Aug 2023 06:09:42 GMT",
80+
"comments": {}
81+
},
82+
{
83+
"version": "0.14.0",
84+
"tag": "@visactor/vdataset_v0.14.0",
85+
"date": "Thu, 03 Aug 2023 08:03:01 GMT",
86+
"comments": {}
87+
},
488
{
589
"version": "0.13.4",
690
"tag": "@visactor/vdataset_v0.13.4",

0 commit comments

Comments
 (0)