feat: 合并 master 到 next

.github/ISSUE_TEMPLATE/bug-report.md

@@ -49,7 +49,7 @@ eg.
 
 <!-- Required! -->
 <!-- eg. `s2Options` and `s2DataCfg`, or `<SheetComponent {...} />` -->
-<!-- 请粘贴你的核心代码片段，包括但不限于 `报错信息`, `s2Options` 等，请不要粘贴你自己的业务代码，请注意使用 markdown code 标签 -->
+<!-- 请粘贴你的核心代码片段 （文本形式，而不是图片），包括但不限于 `报错信息`, `s2Options` 等，请不要粘贴你自己的业务代码，请注意使用 markdown code 标签 -->
 <!-- 如果你使用官网的在线示例，编辑代码后复现了 Bug，请粘贴你的代码，而不是直接贴一个在线示例的链接，没有任何意义，它不会保存你刚写的代码 -->
 
 ### 🔗 Reproduce Link

.github/ISSUE_TEMPLATE/feature-request.md

@@ -8,6 +8,39 @@ labels: 🙏feature request
 <!-- ⚠️ Please fill in the template strictly, otherwise it will be closed directly （请严格按照模板填写，否则直接关闭） -->
 <!-- ⚠️ 请严格按照模板填写，否则直接关闭 -->
 
+### 🏷 Version
+
+<!-- Required! -->
+<!-- 请填写你正在使用的版本 -->
+<!-- 请不要写 🙅🏻‍♀️🚫 `latest`, `1.x` -->
+<!--
+eg.
+
+| Package        | Version |
+| -------------- | ------- |
+| @antv/s2       |  1.2.0  |
+| @antv/s2-react |  1.3.3  |
+| @antv/s2-vue   |   -     |
+
+-->
+
+| Package        | Version |
+| -------------- | ------- |
+| @antv/s2       |         |
+| @antv/s2-react |         |
+| @antv/s2-vue   |         |
+
+### Sheet Type
+
+<!-- Required! -->
+<!-- 请填写你具体使用的表格类型 -->
+
+- [ ] PivotSheet
+- [ ] TableSheet
+- [ ] GridAnalysisSheet
+- [ ] StrategySheet
+- [ ] EditableSheet
+
 ### 🖋 Description
 
 <!-- Required! -->

.github/workflows/auto-release.yml

@@ -16,7 +16,7 @@ jobs:
         node-version: [20] # semantic-release 需要 >= 16 的 Node.js 环境
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Python 3.11 和 node-gyp 有兼容问题, 导致无法安装依赖
       # https://github.com/slint-ui/slint/commit/a9c48e33502fdebc36c5aa2f4f516c2218424679#diff-944291df2c9c06359d37cc8833d182d705c9e8c3108e7cfe132d61a06e9133dd
@@ -29,7 +29,7 @@ jobs:
           version: 8
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -44,7 +44,7 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "🚀 开始自动发布 🚀",
+                "title": "🚑 开始自动发布 (${{ github.head_ref || github.ref_name }}) 🚑",
                 "text": "🔗 请点击链接查看详情",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/auto-release.yml",
                 "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*gt5-RZDjt3IAAAAAAAAAAAAADmJ7AQ/original"
@@ -77,7 +77,7 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "🚨 自动发布失败 🚨",
+                "title": "🚨 自动发布失败 (${{ github.head_ref || github.ref_name }})",
                 "text": "🔗 请点击链接查看具体原因, 及时修复, 尝试点击右上角 [Re-run all jobs] 重试, 或手动发布 🚑",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/auto-release.yml",
                 "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*PRSkSqsE_vYAAAAAAAAAAAAADmJ7AQ/original"

.github/workflows/codeql-analysis.yml

@@ -9,17 +9,21 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 🏨 CodeQL
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, alpha, beta, next ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, alpha, beta, next ]
   schedule:
     - cron: '38 0 * * 2'
 
+concurrency:
+  group: ${{github.workflow}}-${{github.event_name}}-${{github.ref}}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

.github/workflows/compressed-size.yml

@@ -4,14 +4,18 @@ on:
   pull_request:
     types: [opened, synchronize]
 
+concurrency:
+  group: ${{github.workflow}}-${{github.event_name}}-${{github.ref}}
+  cancel-in-progress: true
+
 jobs:
   compressed-size:
 
     runs-on: macos-latest
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Python 3.11 和 node-gyp 有兼容问题, 导致无法安装依赖
     # https://github.com/slint-ui/slint/commit/a9c48e33502fdebc36c5aa2f4f516c2218424679#diff-944291df2c9c06359d37cc8833d182d705c9e8c3108e7cfe132d61a06e9133dd

.github/workflows/disscustion.yml

@@ -1,5 +1,5 @@
 
-name: Discussions
+name: 💬 Discussions
 
 on:
   discussion:
@@ -21,6 +21,6 @@ jobs:
                 "title": "📢 用户: ${{ github.event.discussion.user.login }} 创建了讨论：(${{ github.event.discussion.title }})",
                 "text": "👀 点击查看",
                 "messageUrl": "${{ github.event.discussion.html_url }}",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original"
               }
             }

.github/workflows/issue-labeled.yml

@@ -105,7 +105,7 @@ jobs:
           body: |
             你好 @${{ github.event.issue.user.login }}，经过我们的反复讨论, 你的需求现已被采纳, 我们会排期开发, 但人力资源有限, 短期内无法支持, 请关注后续发布日志。当然, 如果能贡献 PR 帮助我们改进, 不胜感激！
 
-            Hello, @${{ github.vent.issue.user.login }}, your feature request has been accepted after our repeated discussion. We will schedule the development. However, it could not be supported in the short term since limited time, please pay attention to the follow-up release logs. Of course, looking forward for your PR!
+            Hello, @${{ github.event.issue.user.login }}, your feature request has been accepted after our repeated discussion. We will schedule the development. However, it could not be supported in the short term since limited time, please pay attention to the follow-up release logs. Of course, looking forward for your PR!
 
       - name: Rejected
         if: github.event.label.name == '❌ won''t support'
@@ -118,3 +118,25 @@ jobs:
             你好 @${{ github.event.issue.user.login }}，经过我们的反复讨论, 你的需求过于定制化，不适合直接添加到 S2 中, S2 作为开源框架，只会进行通用能力的增强和自定义接口的开放。你可以通过 S2 提供的自定义能力自行实现，感谢你的理解。
 
             Hello, @${{ github.event.issue.user.login }}, After our repeated discussions, your needs are too customized and not suitable for implementing directly to S2. As an open source framework, S2 will only enhance general capabilities and open custom interfaces. You can implement it yourself through the customization capabilities provided by S2, thank you for your understanding.
+
+      - name: Supported or fixed in next
+        if: github.event.label.name == '✨ supported or fixed in next'
+        uses: actions-cool/issues-helper@main
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            你好 @${{ github.event.issue.user.login }}，该功能或缺陷已经在 `2.0 next 版本` 中支持或修复，`next` 版本目前处于内测中, 感谢你的支持与理解。
+
+            如有任何 `2.0 版本` 问题，请前往[讨论区](https://github.com/antvis/S2/discussions/1933)，正式版预计年底发布 (文档施工中 🚧), 抢先试用:
+
+            ```bash
+            yarn add @antv/s2@next
+            yarn add @antv/s2-react@next
+            yarn add @antv/s2-vue@next
+            ```
+
+            Hello, @${{ github.event.issue.user.login }}, This feature or flaw has been supported or fixed in `2.0 next version`, `next` version is currently in private beta, thank you for your support and understanding.
+
+            Any `2.0` version issues, please go to [discussion](https://github.com/antvis/S2/discussions/1933), which released the official version is expected to the end (document 🚧) during construction, the first trial:

.github/workflows/issue-opend.yml

@@ -20,9 +20,9 @@ jobs:
 
             Hello, @${{ github.event.issue.user.login }}, please edit your issue title. a concise issue title will save everyone time. please do not leave the title as the body or empty.
 
-      # 如果是 bug 的 issue, 但是基本的版本号,表格类型, 描述都没有, 直接关闭, 不多BB.
-      - name: check bug report issue body
-        if: contains(github.event.issue.title, '🐛') == true && contains(github.event.issue.body, 'Version') == false && contains(github.event.issue.body, 'Sheet Type') == false && contains(github.event.issue.body, 'Description') == false
+      # 如果 issue 的提交者无视模版, 连基本的版本号,表格类型, 描述都没有, 直接自动关闭, 不多BB.
+      - name: check issue body
+        if: contains(github.event.issue.body, 'Version') == false && contains(github.event.issue.body, 'Sheet Type') == false && contains(github.event.issue.body, 'Description') == false
         uses: actions-cool/issues-helper@main
         with:
           actions: 'create-comment,add-labels,close-issue'

.github/workflows/lint.yml

@@ -1,12 +1,11 @@
-name: lint
+name: 👨‍🔬 lint
 
 on: [pull_request]
 
 concurrency:
   group: ${{github.workflow}}-${{github.event_name}}-${{github.ref}}
   cancel-in-progress: true
 
-
 jobs:
   lint:
     runs-on: macos-latest
@@ -16,7 +15,7 @@ jobs:
         node-version: [20]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Python 3.11 和 node-gyp 有兼容问题, 导致无法安装依赖
       # https://github.com/slint-ui/slint/commit/a9c48e33502fdebc36c5aa2f4f516c2218424679#diff-944291df2c9c06359d37cc8833d182d705c9e8c3108e7cfe132d61a06e9133dd
@@ -29,7 +28,7 @@ jobs:
           version: 8
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -43,8 +42,8 @@ jobs:
       - name: Build
         run: pnpm build
 
-      - name: Bundle size
-        run: pnpm bundle:size
+      - name: Bundle size limit
+        run: pnpm build:size-limit
         env:
           CI: true
           BUNDLESIZE_GITHUB_TOKEN: ${{ secrets.BUNDLESIZE_GITHUB_TOKEN }}

.github/workflows/pr-auto-assign-reviewer.yml

@@ -21,5 +21,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           pr-emoji: '+1, rocket'
-          reviewers: 'serializedowen,lcx-seima,lijinke666,wjgogogo,stone-lyl,GaoFuhong'
+          reviewers: 'lijinke666,wjgogogo,wuhaiyang'
           review-creator: false

.github/workflows/prerelease-notify.yml

@@ -23,7 +23,7 @@ jobs:
             ${{ secrets.DING_TALK_ACCESS_TOKEN }}
             ${{ secrets.DING_TALK_GROUP_TOKEN }}
           notify_title: '🎉 {release_tag} 发布 🎉'
-          notify_body: '## { title } <hr /> ![preview](https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png) <hr /> { body } <hr />'
+          notify_body: '## { title } <hr /> ![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> { body } <hr />'
           notify_footer: '> 该版本为测试版, 请谨慎使用, 前往 [**AntV/S2 Releases**]({ release_url }) 查看完整更新日志.'
           at_all: false
           enable_prerelease: true

.github/workflows/release-notify.yml

@@ -18,8 +18,8 @@ jobs:
             ${{ secrets.DING_TALK_ACCESS_TOKEN }}
             ${{ secrets.DING_TALK_GROUP_TOKEN }}
             ${{ secrets.DING_TALK_PUBLIC_TOKEN }}
-          notify_title: '🎉 S2 新版本发布啦 🎉'
-          notify_body: '## { title } <hr /> ![preview](https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png) <hr /> 看看有哪些更新吧 <hr />'
+          notify_title: '🎉 AntV/S2 新版本发布啦 🎉'
+          notify_body: '## { title } <hr /> ![preview](https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original) <hr /> 看看有哪些更新吧 <hr />'
           notify_footer: '> 前往 [**AntV/S2 Releases**](https://github.com/antvis/S2/releases/latest) 查看完整更新日志.'
           at_all: false
           enable_prerelease: false

.github/workflows/release-success.yml

@@ -16,8 +16,19 @@ jobs:
     defaults:
       run:
         working-directory: s2-site
+
+    strategy:
+      matrix:
+        node-version: [18]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
 
       - name: Git bootstrap
         run: |
@@ -56,7 +67,7 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "📢 开始自动部署旧版官网(https://s2.antv.vision) 📢 ",
+                "title": "📢 开始自动部署旧版官网 (https://s2.antv.vision) 📢 ",
                 "text": "🔗 请点击链接查看详情",
                 "messageUrl": "https://github.com/antvis/S2/actions/workflows/release-success.yml",
                 "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*gt5-RZDjt3IAAAAAAAAAAAAADmJ7AQ/original"
@@ -68,7 +79,7 @@ jobs:
         with:
           node-version: 16
           cache: 'yarn'
-          
+
       # 安装官网依赖
       - name: Install Dependencies
         run: yarn

.github/workflows/site-build-notify.yml

@@ -16,10 +16,10 @@ jobs:
             {
               "msgtype": "link",
               "link": {
-                "title": "✅ 旧官网(https://s2.antv.vision) 部署成功",
-                "text": "点击访问 https://s2.antv.vision/",
+                "title": "✅ 旧官网 (https://s2.antv.vision) 部署成功",
+                "text": "点击访问",
                 "messageUrl": "https://s2.antv.vision/",
-                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*Eel8Rp5jlAkAAAAAAAAAAAAADmJ7AQ/original"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original"
               }
             }
 

.github/workflows/sync-notify.yml

@@ -23,7 +23,7 @@ jobs:
                 "title": "✅ 同步 changelog 成功",
                 "text": "📢 请发布值班合并该 PR 后, 访问官网查看是否有异常",
                 "messageUrl": "https://s2.antv.antgroup.com",
-                "picUrl": "https://gw.alipayobjects.com/zos/antfincdn/ISzgBCtgR/2c5c4aaa-4f40-46f7-8f6b-427fa9ff07bb.png"
+                "picUrl": "https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*1PTTQLk3j5AAAAAAAAAAAAAADmJ7AQ/original"
               }
             }
 

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: test
+name: 💯 test
 
 on: [pull_request]
 
@@ -18,7 +18,7 @@ jobs:
         node-version: [20]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Python 3.11 和 node-gyp 有兼容问题, 导致无法安装依赖
       # https://github.com/slint-ui/slint/commit/a9c48e33502fdebc36c5aa2f4f516c2218424679#diff-944291df2c9c06359d37cc8833d182d705c9e8c3108e7cfe132d61a06e9133dd
@@ -31,7 +31,7 @@ jobs:
           version: 8
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -44,9 +44,10 @@ jobs:
           pnpm test:ci-coverage
 
       - name: Upload test coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
           verbose: true
 
       - name: Workflow failed alert

.releaserc.base.js

@@ -1,11 +1,13 @@
+const path = require('path');
+
 module.exports = {
+  extends: 'semantic-release-monorepo',
   branches: [
     'latest',
     { name: 'beta', channel: 'beta', prerelease: true },
     { name: 'alpha', channel: 'alpha', prerelease: true },
     { name: 'next', channel: 'next', prerelease: true },
   ],
-  extends: 'semantic-release-monorepo',
   plugins: [
     [
       '@semantic-release/commit-analyzer',
@@ -26,11 +28,19 @@ module.exports = {
     '@semantic-release/npm',
     [
       '@semantic-release/git',
-      {
+    {
         message: 'chore(release): 🤖 ${nextRelease.gitTag} [skip ci]',
-      },
+    },
     ],
     '@semantic-release/github',
+    [
+      '@semantic-release/exec',
+      {
+        prepareCmd:
+          `node ${path.resolve(__dirname, './scripts/add-version.js')} ` +
+          '${nextRelease.gitTag}',
+      },
+    ],
   ],
   preset: 'angular',
 };