Merge branch 'next' into release-3.6.8-app-wzh

handsomeliuyang · Sep 13, 2023 · 331e872 · 331e872
2 parents bdb0d3c + f45005c
commit 331e872
Show file tree

Hide file tree

Showing 122 changed files with 623 additions and 462 deletions.
diff --git a/.github/workflows/auto-review.yml b/.github/workflows/auto-review.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name : GITHUB CONTEXT
         env: 
           GITHUB_CONTEXT: ${{ toJson(github) }} 

diff --git a/.github/workflows/dependabot-update-lockfile.yml b/.github/workflows/dependabot-update-lockfile.yml
@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with :
           ref : ${{ github.head_ref }}
 

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with :
           ref : ${{ github.ref || github.head_ref || github.ref_name }}
       - name: Use Node.js ${{ matrix.node-version }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       # Setup
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node ${{ matrix.node_version }}
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/sync-components-types.yml b/.github/workflows/sync-components-types.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Checkout taro-docs
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: NervJS/taro-docs
           fetch-depth: 1
@@ -51,9 +51,12 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          base: master
+          body: "sync components types"
+          branch: "refactor/sync-types"
           commit-message: "refactor(types): sync components types"
+          delete-branch: true
           title: "refactor(types): sync components types"
-          body: "sync components types"
           labels: |
             A-typings
             A-components

diff --git a/README.md b/README.md
@@ -34,19 +34,20 @@
   <a href="https://github.com/NervJS/taro">
     <img src="https://img.shields.io/github/release-date/NervJS/taro" alt="GitHub Release Date">
   </a>
+  <p>
+    <a href="https://github.com/NervJS/taro/blob/next/README.md">简体中文</a> | <a href="https://github.com/NervJS/taro/blob/next/README_EN.md">English</a>
+  </p>
 </div>
 
-[简体中文](./README.md) | [English](./README_EN.md)
-
 > 👽 Taro['tɑ:roʊ]，泰罗·奥特曼，宇宙警备队总教官，实力最强的奥特曼。
 
 ## 目录
 
 1. [简介](#简介)
 2. [学习资源](#学习资源)
 3. [社区共享](#社区共享)
-4. [使用案例](#使用案例)
-5. [特性介绍](#特性介绍)
+4. [项目状态](#项目状态)
+5. [使用案例](#使用案例)
 6. [加入共建](#加入共建)
 7. [问题反馈与建议](#问题反馈与建议)
 8. [特别鸣谢](#特别鸣谢)
@@ -85,6 +86,10 @@ Taro 1/2 迁移至 Taro 3，请阅读[《Taro 版本升级权威指南》](https
 | [@antmjs/vantui](https://github.com/AntmJS/vantui) | https://antmjs.github.io/vantui/#/home          | 基于有赞 VantWeapp 开发的同时支持 Taro 和 React 的 UI 库 | React      | Taro 3                                    |
 | [Tard](https://github.com/jd-antelope/tard)        | https://tard-ui.selling.cn/                     | 一套基于 Taro 框架开发的多端 React UI 组件库             | React      | Taro 3                                    |
 
+## 项目状态
+
+![Alt](https://repobeats.axiom.co/api/embed/275806b6f177f7e4c005e956d94440562635c36d.svg "Repobeats analytics image")
+
 ## 使用案例
 
 Taro 已经投入了我们的生产环境中使用，业界也在广泛地使用 Taro 开发多端应用。
@@ -93,74 +98,6 @@ Taro 已经投入了我们的生产环境中使用，业界也在广泛地使用
 
 [征集更多优秀案例](https://github.com/NervJS/taro/issues/244)
 
-## 特性介绍
-
-### 跨框架支持
-
-#### React/Nerv 支持
-
-在 Taro 3 中可以使用完整的 React/Nerv 开发体验，具体请参考[基础教程——React](https://docs.taro.zone/docs/react-overall)
-
-代码示例
-
-```javascript
-import React, { Component } from 'react'
-import { View, Text } from '@tarojs/components'
-
-export default class Index extends Component {
-  state = {
-    msg: 'Hello World！ ',
-  }
-
-  componentWillUnmount() {}
-
-  componentDidShow() {}
-
-  componentDidHide() {}
-
-  render() {
-    return (
-      <View className="index">
-        <Text>{this.state.msg}</Text>
-      </View>
-    )
-  }
-}
-```
-
-#### Vue 支持
-
-在 Taro 3 中可以使用完整的 Vue 开发体验，具体请参考[基础教程——Vue](https://docs.taro.zone/docs/vue-overall)
-
-代码示例
-
-```vue
-<template>
-  <view class="index">
-    <text>{{ msg }}</text>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      msg: 'Hello World!',
-    }
-  },
-  created() {},
-  onShow() {},
-  onHide() {},
-}
-</script>
-```
-
-### 多端转换支持
-
-Taro 方案的初心就是为了打造一个多端开发的解决方案。
-
-目前 Taro 3 可以支持转换到`微信/京东/百度/支付宝/字节跳动/ QQ 小程序/H5/React Native` 等端。
-
 ## 加入共建
 
 #### 加入 Taro 社区共建倡议

diff --git a/README_EN.md b/README_EN.md
@@ -34,19 +34,20 @@
   <a href="https://github.com/NervJS/taro">
     <img src="https://img.shields.io/github/release-date/NervJS/taro" alt="GitHub Release Date">
   </a>
+  <p>
+    <a href="https://github.com/NervJS/taro/blob/next/README.md">简体中文</a> | <a href="https://github.com/NervJS/taro/blob/next/README_EN.md">English</a>
+  </p>
 </div>
 
-[简体中文](./README.md) | [English](./README_EN.md)
-
 > 👽 Taro['tɑ:roʊ], Ultraman Taro, the chief instructor of the Space Guard, the strongest Ultraman.
 
 ## Contents
 
 1. [Introduction](#Introduction)
 2. [Resources](#Resources)
 3. [Community](#Community)
-4. [Cases](#Cases)
-5. [Feature](#Feature)
+4. [Status](#Status)
+5. [Cases](#Cases)
 6. [Join us](#join-us)
 7. [Issues](#Issues)
 8. [Acknowledgements](#Acknowledgements)
@@ -85,7 +86,9 @@ Juejin book: [Taro Cross-platform Development in Action](https://juejin.im/book/
 | [taroify](https://github.com/mallfoundry/taroify)  | https://taroify.gitee.io/taroify.com/introduce/ | A light-weighted and reliable Taro library for mini-programs (Vant's Taro version) | React | Taro 3 |
 | [@antmjs/vantui](https://github.com/AntmJS/vantui)  | https://antmjs.github.io/vantui/#/home | A UI library that supports Taro and React, based on Youzan VantWeapp | React | Taro 3 |
 
+## Status
 
+![Alt](https://repobeats.axiom.co/api/embed/275806b6f177f7e4c005e956d94440562635c36d.svg "Repobeats analytics image")
 ## Cases
 
 Taro has been used in our production environment, and widely used in the industry for cross-platform development.
@@ -94,73 +97,6 @@ Taro has been used in our production environment, and widely used in the industr
 
 [Call for more cases](https://github.com/NervJS/taro/issues/244)
 
-## Feature
-
-### Framework support
-
-#### React/Nerv
-
-Taro 3 has full-featured development experience with React/Nerv, please refer to [Basic tutorial for React](https://nervjs.github.io/taro/docs/react).
-
-Example:
-
-```javascript
-import React, { Component } from 'react'
-import { View, Text } from '@tarojs/components'
-
-export default class Index extends Component {
-  state = {
-    msg: 'Hello World！ '
-  }
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
-  render () {
-    return (
-      <View className='index'>
-        <Text>{this.state.msg}</Text>
-      </View>
-    )
-  }
-}
-```
-
-#### Vue
-
-Taro 3 has full-featured development experience with Vue, please refer to [Basic tutorial for Vue](https://nervjs.github.io/taro/docs/vue).
-
-Example:
-
-```vue
-<template>
-  <view class="index">
-    <text>{{msg}}</text>
-  </view>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello World!'
-    }
-  },
-  created () {},
-  onShow () {},
-  onHide () {}
-}
-</script>
-```
-
-### Cross-platform support
-
-Taro's ultimate goal is to provide a solution for cross-platform development.
-
-Taro supports converting code to WeChat/JD/Baidu/Alipay/ByteDance/QQ mini-programs and H5 applications.
-
 ## Join us
 
 #### Taro community

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "开放式跨端跨框架开发解决方案",
   "homepage": "https://github.com/NervJS/taro#readme",
   "author": "O2Team",

diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "Taro babel preset",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "create taro app with one command",
   "author": "VincentW <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/create-app#readme",

diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [

diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "Taro specific linting rules for ESLint",
   "main": "index.js",
   "files": [

diff --git a/packages/postcss-html-transform/package.json b/packages/postcss-html-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-html-transform",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "transform html tag name selector",
   "main": "index.js",
   "author": "drchan",

diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "parse constants defined in config",
   "main": "index.js",
   "author": "Simba",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "main": "index.js",
   "keywords": [

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "Taro utils internal use.",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/shared#readme",

diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts
@@ -91,6 +91,7 @@ const Button = {
   'hover-start-time': '20',
   'hover-stay-time': '70',
   name: NO_DEFAULT_VALUE,
+  bindagreeprivacyauthorization: NO_DEFAULT_VALUE,
   ...touchEvents
 }
 

diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "description": "Shareable stylelint config for React Native CSS modules",
   "main": "index.js",
   "files": [

diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stylelint-taro-rn",
   "description": "A collection of React Native specific rules for stylelint",
-  "version": "3.6.15",
+  "version": "3.6.16",
   "main": "dist/index.js",
   "files": [
     "dist",