Skip to content

Commit 0651181

Browse files
authored
Merge branch 'next' into dependabot/npm_and_yarn/follow-redirects-1.15.1
2 parents a5ebb6f + 1fde957 commit 0651181

File tree

25 files changed

+2569
-3111
lines changed

25 files changed

+2569
-3111
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ on:
33
# When Release Pull Request is merged
44
push:
55
branches:
6-
- react-native
6+
- next
77
pull_request:
88
branches:
9-
- react-native
9+
- next
1010
types: [closed]
1111

1212
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Taro 是由 [凹凸实验室](https://aotu.io) 倾力打造的多端开发解决
2828

2929
- [Taro UI 使用文档](https://taro-ui.aotu.io)
3030
- [Taro UI 官方示例](https://github.com/NervJS/taro-ui-demo)
31-
- [Taro](https://taro.aotu.io/)
31+
- [Taro](https://taro.jd.com/)
3232
- [Taro 物料市场](https://taro-ext.jd.com)
3333
- [Taro 论坛 Taro-UI 板块](https://taro-club.jd.com/category/11/taro-ui)
3434

RN.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,11 @@ cd packages/taro-ui-demo-rn
3131
yarn dev:rn
3232
```
3333
demo 适配开发,更改组件 style 样式,需要更改一下 packages/taro-ui-demo-rn/src/app.scss 触发一下样式重编。
34+
35+
#### DEMO release
36+
需要打一个 tag,比如:
37+
```sh
38+
git tag -a 'v3.1.0-beta.3-rn' -m 'rn qrcode for v3.1.0-beta.3'
39+
git push origin v3.1.0-beta.3-rn
40+
```
41+
git ci 部署,最后生成 release 信息

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"license": "MIT"
1414
}
1515
},
16-
"version": "3.1.0-beta.3",
16+
"version": "3.1.0-beta.4",
1717
"npmClient": "yarn"
1818
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "taro-ui-demo-rn",
4-
"version": "3.1.0-beta.2",
4+
"version": "3.1.0-beta.4",
55
"description": "Taro UI demo",
66
"author": "O2Team <aotu.io>",
77
"homepage": "https://taro-ui.aotu.io",
@@ -53,7 +53,7 @@
5353
"react-dom": "^16.13.0",
5454
"react-native": "~0.68.1",
5555
"react-native-modal": "^13.0.0",
56-
"taro-ui": "3.1.0-beta.2"
56+
"taro-ui": "3.1.0-beta.4"
5757
},
5858
"devDependencies": {
5959
"@babel/core": "^7.8.0",

0 commit comments

Comments
 (0)