Skip to content

Commit fa25aef

Browse files
robinv8robinv8
authored
chore(release): 3.6.18 (#1708)
New Features - 添加 Timeline 获取节点信息事件 (#1650) - List 组件支持自定义 icon 属性 (#1626) - Card 组件 extra 属性支持 ReactNode (#1684) Bug Fixes - 修复 AtAccordion 组件展开高度错误的问题 (#1656) - 修复 enableNative 属性不存在的问题 (#1654) - 修复日历组件无法正常加载的问题 Improvements - yarn 升级到 pnpm - 完善 CI 流程 - 更新 Taro-UI 文档地址
1 parent a4da29b commit fa25aef

File tree

9 files changed

+37
-31
lines changed

9 files changed

+37
-31
lines changed

‎.github/workflows/publish.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,23 @@ on:
1212

1313
env:
1414
CI: true
15+
permissions: {}
1516
jobs:
1617
publish:
1718
permissions:
1819
contents: write # to create tags and refs
1920
actions: write # to cancel running workflow (andymckay/cancel-action)
2021
issues: write # to create comment
22+
pull-requests: write # to create comment and so on
2123

2224
name: publish
2325
runs-on: ubuntu-latest
24-
2526
steps:
2627
# Setup
2728
- name: Checkout
28-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
2930
- name: Setup Node ${{ matrix.node_version }}
30-
uses: actions/setup-node@v1
31+
uses: actions/setup-node@v3
3132
with:
3233
node-version: 16
3334
registry-url: 'https://registry.npmjs.org'
@@ -48,10 +49,10 @@ jobs:
4849
# Get commit message
4950
- name: Get commit message
5051
run: |
51-
COMMIT_MESSAGE=$(git log --format=%B -n 1)
52-
echo "commitmsg=${COMMIT_MESSAGE}" >> $GITHUB_ENV
52+
COMMIT_MESSAGE=$(git log --format=%s -n 1)
53+
echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV
5354
- name: Show commit message
54-
run : echo "$commitmsg"
55+
run : echo "$COMMIT_MESSAGE"
5556

5657
- name: Commit message compliance verification
5758
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' ) != true
@@ -74,15 +75,15 @@ jobs:
7475

7576
# Define ${CURRENT_VERSION}
7677
- name: Set Current Version
77-
if: startsWith( env.commitmsg , 'chore(release):' )
78+
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' )
7879
shell: bash -ex {0}
7980
run: |
8081
CURRENT_VERSION=$(node -p 'require("./packages/taro-ui/package.json").version')
8182
echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
8283
8384
# Check git tag
8485
- name: Tag Check
85-
if: startsWith( env.commitmsg , 'chore(release):' )
86+
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' )
8687
id: tag_check
8788
shell: bash -ex {0}
8889
run: |
@@ -112,25 +113,26 @@ jobs:
112113
restore-keys: |
113114
${{ runner.os }}-
114115
- name: install
115-
uses: pnpm/action-setup@v2.2.4
116+
uses: pnpm/action-setup@v2.4.0
116117
with:
117118
version: 8
118119
run_install: |
119120
- recursive: true
120121
args: [--frozen-lockfile]
121122
- name: build
122-
run: pnpm build
123+
run: |
124+
pnpm build
123125
124126
# Git stash
125127
- name: Drop current changes
126-
if: startsWith( env.commitmsg , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false'
128+
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false'
127129
run: |
128130
git add .
129131
git stash
130132
131133
# Create git tag
132134
- name: Create Git Tag
133-
if: startsWith( env.commitmsg , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false'
135+
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false'
134136
uses: azu/action-package-version-to-git-tag@v1
135137
with:
136138
version: ${{ env.CURRENT_VERSION }}
@@ -143,9 +145,9 @@ jobs:
143145
- name: Publish
144146
run: |
145147
if [ '${{ github.event_name }}' == 'pull_request' ] ; then
146-
pnpm publish --registry=https://registry.npmjs.org/ --publish-branch=${{ github.ref }} -r
148+
cd README.md packages/taro-ui & pnpm publish --registry=https://registry.npmjs.org/ --publish-branch=${{ github.ref }} -r
147149
elif [ '${{ github.event_name }}' == 'push' ] ; then
148-
pnpm publish --registry=https://registry.npmjs.org/ --publish-branch=${{ github.ref_name }} -r ${{ env.PUBLISH_PARAMS }}
150+
cd README.md packages/taro-ui & pnpm publish --registry=https://registry.npmjs.org/ --publish-branch=${{ github.ref_name }} -r ${{ env.PUBLISH_PARAMS }}
149151
fi
150152
env:
151153
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -154,7 +156,7 @@ jobs:
154156
# Create relase when event is PR
155157
- name: Create Release
156158
id: create_release
157-
if: startsWith( env.commitmsg , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false' && github.event.pull_request.merged == true
159+
if: startsWith( env.COMMIT_MESSAGE , 'chore(release):' ) && steps.tag_check.outputs.exists_tag == 'false' && github.event.pull_request.merged == true
158160
uses: actions/create-release@v1
159161
env:
160162
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "taro-ui",
44
"description": "UI KIT for Taro",
55
"author": "O2Team <aotu.io>",
6-
"homepage": "https://taro-ui.aotu.io",
6+
"homepage": "https://taro-ui.taro.zone",
77
"repository": {
88
"type": "git",
99
"url": "git@github.com:nervjs/taro-ui.git"
@@ -17,7 +17,11 @@
1717
"build:demo": "pnpm --filter=taro-ui-demo build:h5",
1818
"build:doc": "pnpm run build:demo && pnpm --filter=taro-ui-docs build",
1919
"clean": " rimraf **/dist && rimraf **/node_modules",
20-
"prepare": "husky install"
20+
"prepare": "husky install",
21+
"version": "run-s version:*",
22+
"version:release": "pnpm --parallel -r --aggregate-output --filter=./packages/* exec npm version ${npm_package_version}",
23+
"version:git": "git add . && git commit -m \"chore(release): publish ${npm_package_version}\"",
24+
"version:changelog": "conventional-changelog -p angular"
2125
},
2226
"devDependencies": {
2327
"@babel/core": "^7.22.11",

‎packages/taro-ui-demo-rn/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"private": true,
33
"name": "taro-ui-demo-rn",
4-
"version": "3.1.0-beta.4",
4+
"version": "3.2.0",
55
"description": "Taro UI demo",
66
"author": "O2Team <aotu.io>",
7-
"homepage": "https://taro-ui.aotu.io",
7+
"homepage": "https://taro-ui.taro.zone",
88
"repository": {
99
"type": "git",
1010
"url": "git@github.com:nervjs/taro-ui.git"

‎packages/taro-ui-demo-rn/src/pages/form/input/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,15 @@ export default class Index extends React.Component<IndexProps, IndexState> {
308308
>
309309
{/* <Image
310310
mode='scaleToFill'
311-
src='https://taro-ui.aotu.io/h5/static/images/verification_code.png'
311+
src='https://taro-ui.taro.zone/h5/static/images/verification_code.png'
312312
/> */}
313313
<ImageBackground
314314
style={{
315315
width: Taro.pxTransform(145),
316316
height: Taro.pxTransform(60)
317317
}}
318318
source={{
319-
uri: 'https://taro-ui.aotu.io/h5/static/images/verification_code.png'
319+
uri: 'https://taro-ui.taro.zone/h5/static/images/verification_code.png'
320320
}}
321321
resizeMode='cover'
322322
/>

‎packages/taro-ui-demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"private": true,
33
"name": "taro-ui-demo",
4-
"version": "3.1.0-beta.4",
4+
"version": "3.2.0",
55
"description": "Taro UI demo",
66
"author": "O2Team <aotu.io>",
7-
"homepage": "https://taro-ui.aotu.io",
7+
"homepage": "https://taro-ui.taro.zone",
88
"repository": {
99
"type": "git",
1010
"url": "git@github.com:nervjs/taro-ui.git"

‎packages/taro-ui-docs/markdown/questions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ h5: {
5555

5656
## 如何自定义样式？
5757

58-
请查看 [「自定义主题」](https://taro-ui.aotu.io/#/docs/customizetheme) 章节
58+
请查看 [「自定义主题」](https://taro-ui.taro.zone/#/docs/customizetheme) 章节
5959

6060
## 自定义样式为什么没有生效（H5 生效，微信小程序没生效）？
6161

‎packages/taro-ui-docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"private": true,
33
"name": "taro-ui-docs",
4-
"version": "3.0.0-alpha.10",
4+
"version": "3.2.0",
55
"description": "Taro UI docs",
66
"author": "O2Team <aotu.io>",
7-
"homepage": "https://taro-ui.aotu.io",
7+
"homepage": "https://taro-ui.taro.zone",
88
"repository": {
99
"type": "git",
1010
"url": "git@github.com:nervjs/taro-ui.git"

‎packages/taro-ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "taro-ui",
3-
"version": "3.1.1",
3+
"version": "3.2.0",
44
"description": "UI KIT for Taro",
55
"module": "dist/index.esm.js",
66
"main": "dist/index.js",
@@ -23,7 +23,7 @@
2323
"rn"
2424
],
2525
"author": "O2Team <aotu.io>",
26-
"homepage": "https://taro-ui.aotu.io",
26+
"homepage": "https://taro-ui.taro.zone",
2727
"repository": {
2828
"type": "git",
2929
"url": "git@github.com:nervjs/taro-ui.git"

‎packages/taro-ui/types/tab-bar.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ export interface TabItem {
2424
/**
2525
* icon className 前缀，用于第三方字体图标库，
2626
* 比如想使用'fa fa-clock' 的图标，则传入 iconPrefixClass='fa' iconType='clock'，
27-
* 参考[拓展图标库详细](https://taro-ui.aotu.io/#/docs/icon)
27+
* 参考[拓展图标库详细](https://taro-ui.taro.zone/#/docs/icon)
2828
*/
2929
iconPrefixClass?: string
3030
/**
3131
* 未选中时展示的 icon 类型，可扩展第三方字体图标库，
32-
* 参考[拓展图标库详细](https://taro-ui.aotu.io/#/docs/icon)
32+
* 参考[拓展图标库详细](https://taro-ui.taro.zone/#/docs/icon)
3333
*/
3434
iconType?: string
3535
/**
3636
* 选中时展示的 icon 类型，可扩展第三方字体图标库，
37-
* 参考[拓展图标库详细](https://taro-ui.aotu.io/#/docs/icon)
37+
* 参考[拓展图标库详细](https://taro-ui.taro.zone/#/docs/icon)
3838
*/
3939
selectedIconType?: string
4040
/**

0 commit comments

Comments
 (0)