VisActor · neuqzxy · Jun 27, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 20, 2023
diff --git a/.github/workflows/bug-server.yml b/.github/workflows/bug-server.yml
@@ -2,8 +2,10 @@ name: Bug Server CI
 
 # 这里业务方根据需求设置
 on:
-  pull_request:
+  push:
     branches: ['main']
+  pull_request:
+    branches: ['main', 'develop']
 
 jobs:
   build:

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -3,7 +3,9 @@ name: Pre-release CI
 on:
   push:
     branches:
-      - pre-release/*
+      - 'pre-release/[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+'
+      - 'pre-release/[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
+      - 'pre-release/[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
 
 jobs:
   build:
@@ -30,38 +32,39 @@ jobs:
       - name: Install rush
         run: node common/scripts/install-run-rush.js install --bypass-policy
 
-      - name: Build packages
-        run: node common/scripts/install-run-rush.js build --only tag:package
-
       - name: Parse semver version from branch name
         id: semver_parser
-        uses: release-kit/semver@v2
+        uses: xile611/read-package-version-action@v2.1
         with:
-          string: ${{ github.ref_name }}
-          pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default
+          path: packages/vrender
+          semver_string: ${{ github.ref_name }}
+          semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default
 
       - name: Apply prereleaseName
-        run: node common/scripts/install-run-rush.js publish --apply --prerelease-name ${{ steps.semver_parser.outputs.prerelease }} --partial-prerelease
+        run: node common/scripts/install-run-rush.js publish --apply --prerelease-name ${{ steps.semver_parser.outputs.pre_release_name }} --partial-prerelease
+
+      - name: Build packages
+        run: node common/scripts/install-run-rush.js build --only tag:package
 
       - name: Publish to npm
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-        run: node common/scripts/install-run-rush.js publish --publish --include-all --tag ${{ steps.semver_parser.outputs.prerelease }}
+        run: node common/scripts/install-run-rush.js publish --publish --include-all --tag ${{ steps.semver_parser.outputs.pre_release_type }}
 
       - name: Update shrinkwrap
         run: node common/scripts/install-run-rush.js update
 
-      - name: Get package version
+      - name: Get npm version
         id: package-version
-        uses: culshaw/read-package-node-version-actions@v1
+        uses: xile611/read-package-version-action@v2.1
         with:
-          path: './packages/vrender' # 各项目需要修改一下
+          path: packages/vrender
 
       - name: Commit & Push changes
         uses: actions-js/push@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          message: 'build: prelease version ${{ steps.package-version.outputs.version }}'
+          message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}'
           branch: ${{ github.ref_name }}
           author_name: ${{ github.actor }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release CI
 on:
   push:
     branches:
-      - release/*
+      - 'release/[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:
@@ -34,11 +34,17 @@ jobs:
       - name: Install rush
         run: node common/scripts/install-run-rush.js install --bypass-policy
 
+      - name: Update version
+        run: node common/scripts/install-run-rush.js version --bump
+
       - name: Build packages
         run: node common/scripts/install-run-rush.js build --only tag:package
 
-      - name: Update version
-        run: node common/scripts/install-run-rush.js version --bump
+      - name: Run bug server
+        working-directory: ./packages/vrender
+        env:
+          BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }}
+        run: node ../../common/scripts/install-run-rushx.js ci
 
       - name: Publish to npm
         env:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -4,10 +4,8 @@
 name: Unit test CI
 
 on:
-  push:
-    branches: ['main']
   pull_request:
-    branches: ['main']
+    branches: ['main', 'develop']
 
 jobs:
   build:

diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ VRender, not just a feature-rich visual rendering engine, but also a skillful an
   <a href="">Cross-Platform</a>
 </p>
 
+![image test](https://github.com/visactor/vchart/actions/workflows/bug-server.yml/badge.svg)
+![unit test](https://github.com/visactor/vchart/actions/workflows/unit-test.yml/badge.svg)
 [![npm Version](https://img.shields.io/npm/v/@visactor/vrender.svg)](https://www.npmjs.com/package/@visactor/vrender)
 [![npm Download](https://img.shields.io/npm/dm/@visactor/vrender.svg)](https://www.npmjs.com/package/@visactor/vrender)
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/visactor/vrender/blob/main/LICENSE)

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -20,9 +20,9 @@ VRender，不只是一个功能丰富的可视化渲染引可视化渲染擎，
   <a href="">跨端</a>
 </p>
 
-[![npm Version](https://img.shields.io/npm/v/@visactor/vgrammar.svg)](https://www.npmjs.com/package/@visactor/vgrammar)
-[![npm Download](https://img.shields.io/npm/dm/@visactor/vgrammar.svg)](https://www.npmjs.com/package/@visactor/vgrammar)
-[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/visactor/vgrammar/blob/main/LICENSE)
+[![npm Version](https://img.shields.io/npm/v/@visactor/vrender.svg)](https://www.npmjs.com/package/@visactor/vrender)
+[![npm Download](https://img.shields.io/npm/dm/@visactor/vrender.svg)](https://www.npmjs.com/package/@visactor/vrender)
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/visactor/vrender/blob/main/LICENSE)
 
 </div>
 
@@ -119,7 +119,7 @@ st.defaultLayer.add(sy);
 | ---- | ---- |
 
 | [VChart](https://visactor.io/vchart) | 基于 [VisActor/VRender](https://visactor.io/vrender) 封装的图表库。 |
-| [VGrammar](https://visactor.io/vgrammar) | 基于 [VisActor/VRender](https://visactor.io/vgrammar) 封装的语法库。 |
+| [VGrammar](https://visactor.io/vgrammar) | 基于 [VisActor/VRender](https://visactor.io/vrender) 封装的语法库。 |
 | [React 组件库](https://visactor.io/react-vrender) | 基于 [VisActor/VChart](https://visactor.io/vrender) 的 React 图表 组件库。 |
 | [智能生成组件](https://visactor.io/ai-vrender) | 基于 AI 的智能图表生成组件 |
 
@@ -129,7 +129,7 @@ st.defaultLayer.add(sy);
 
 细流成河，终成大海！
 
-<a href="https://github.com/visactor/vgrammar/graphs/contributors"><img src="https://contrib.rocks/image?repo=visactor/vgrammar" /></a>
+<a href="https://github.com/visactor/vrender/graphs/contributors"><img src="https://contrib.rocks/image?repo=visactor/vrender" /></a>
 
 # 许可证
 

diff --git a/common/autoinstallers/lint/change-all.ts b/common/autoinstallers/lint/change-all.ts
@@ -0,0 +1,67 @@
+import path from 'path';
+import chalk from 'chalk';
+import minimist, { ParsedArgs } from 'minimist';
+import { spawnSync, execSync } from 'child_process';
+
+interface RunScriptArgv extends ParsedArgs {
+  message?: string;
+  type?: string;
+  'not-commit'?: boolean; 
+}
+
+function run() {
+  const commitLineConfigPath = path.resolve(__dirname, './commitlint.config.js');
+  const commitLintBinPath = path.resolve(__dirname, './node_modules/.bin/commitlint');
+  const argv: RunScriptArgv = minimist(process.argv.slice(2));
+  let message = argv.message;
+  let bumpType = argv.type;
+  let notCommit = argv['not-commit']
+
+  if (!message) {
+    const lastCommitMessage = execSync('git log -1 --pretty=%B ').toString();
+
+    if (!lastCommitMessage) {
+      process.exit(1);
+    }
+
+    console.log(chalk.green(`[Notice] no message is supplied, we'll use latest commit mesage: ${chalk.red.bold(lastCommitMessage)}`));
+    message = lastCommitMessage;
+  } else {
+    const result = spawnSync(
+      'sh',
+      ['-c', `echo ${message} | ${commitLintBinPath} --config ${commitLineConfigPath}`],
+      {
+        stdio: 'inherit'
+      }
+    );
+
+    if (result.status !== 0) {
+      process.exit(1);
+    }
+  }
+
+  if (!bumpType) {
+    console.log(chalk.green(`[Notice] no bumpType is supplied, we'll use default bumpType: ${chalk.red.bold('patch')}`));
+    bumpType = 'patch';
+  }
+
+  spawnSync('sh', ['-c', `rush change --bulk --bump-type '${bumpType}' --message '${message}'`], {
+    stdio: 'inherit',
+    shell: false,
+  });
+
+  if (!notCommit) {
+    spawnSync('sh', ['-c', 'git add --all'], {
+      stdio: 'inherit',
+      shell: false,
+    });
+
+    spawnSync('sh', ['-c', `git commit -m 'docs: update changlog of rush'`], {
+      stdio: 'inherit',
+      shell: false,
+    });
+  }
+
+}
+
+run();
diff --git a/common/autoinstallers/lint/package.json b/common/autoinstallers/lint/package.json
@@ -6,6 +6,7 @@
     "@commitlint/cli": "17.0.3",
     "@commitlint/config-conventional": "17.0.3",
     "@microsoft/rush-lib": "5.94.1",
+    "chalk": "4.1.2",
     "commitizen": "4.2.5",
     "eslint": "~8.18.0",
     "lint-staged": "13.0.3",

diff --git a/common/autoinstallers/lint/pnpm-lock.yaml b/common/autoinstallers/lint/pnpm-lock.yaml
diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json
@@ -76,31 +76,36 @@
       "shellCommand": "ts-node common/autoinstallers/create/src/cli.ts"
     },
     {
+      "name": "start",
       "commandKind": "global",
-      "name": "components",
-      "summary": "Start the development server of VRender components",
-      "description": "Run this command to start VRender components development server",
-      "shellCommand": "rush run -p @visactor/vrender-components -s start"
+      "summary": "Start the development server",
+      "description": "Run this command to start VRender development server",
+      "shellCommand": "rush run -p @internal/dev-demos -s start"
+    },
+    {
+      "name": "change-all",
+      "commandKind": "global",
+      "autoinstallerName": "run-script",
+      "summary": "Run rush change width lint",
+      "description": "Run this command to start VRender development server",
+      "safeForSimultaneousRushProcesses": true,
+      "shellCommand": "ts-node common/autoinstallers/lint/change-all.ts"
     }
   ],
   "parameters": [
     {
       "parameterKind": "string",
       "longName": "--dir",
       "description": "Specify which dir will handle",
-      "associatedCommands": [
-        "prettier"
-      ],
+      "associatedCommands": ["prettier"],
       "argumentName": "DIR",
       "required": false
     },
     {
       "parameterKind": "string",
       "longName": "--ext",
       "description": "Specify which file type will handle, example `rush prettier --ext 'tsx,scss'`",
-      "associatedCommands": [
-        "prettier"
-      ],
+      "associatedCommands": ["prettier"],
       "argumentName": "EXT",
       "required": false
     },
@@ -109,9 +114,7 @@
       "longName": "--project",
       "shortName": "-p",
       "description": "Specify the name of the main Rush project to be run",
-      "associatedCommands": [
-        "run"
-      ],
+      "associatedCommands": ["run"],
       "argumentName": "PROJECT_NAME",
       "required": true
     },
@@ -120,11 +123,47 @@
       "longName": "--script",
       "shortName": "-s",
       "description": "Specify script name in project",
-      "associatedCommands": [
-        "run"
-      ],
+      "associatedCommands": ["run"],
       "argumentName": "SCRIPT_NAME",
       "required": true
+    },
+    {
+      "parameterKind": "string",
+      "longName": "--message",
+      "shortName": "-m",
+      "description": "Write a message for change",
+      "associatedCommands": ["change-all"],
+      "argumentName": "MESSAGE",
+      "required": false
+    },
+    {
+      "parameterKind": "flag",
+      "longName": "--not-commit",
+      "shortName": "-n",
+      "description": "not commit after run rush change",
+      "associatedCommands": ["change-all"],
+      "required": false
+    },
+    {
+      "parameterKind": "choice",
+      "longName": "--type",
+      "shortName": "-t",
+      "description": "The bump type of change: major, minor, patch, none",
+      "associatedCommands": ["change-all"],
+      "alternatives": [
+        {
+          "name": "patch",
+          "description": "A patch change"
+        },
+        {
+          "name": "minor",
+          "description": "A minor change"
+        },
+        {
+          "name": "major",
+          "description": "A major change"
+        }
+      ]
     }
   ]
-}
+}