Merge branch 'main' into update-swiper

NervJS · Jan 23, 2024 · e3736f3 · e3736f3
2 parents 3415406 + c54bf2a
commit e3736f3
Show file tree

Hide file tree

Showing 88 changed files with 195 additions and 124 deletions.
diff --git a/.github/workflows/sync-components-types.yml b/.github/workflows/sync-components-types.yml
@@ -24,10 +24,11 @@ jobs:
           cp -r .taro-docs/packages/taro-components/types/* packages/taro-components/types
           rm -rf .taro-docs
 
+      # Bootstrap project
       - name: Cache pnpm modules
         uses: actions/cache@v3
         with:
-          path: node_modules
+          path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
@@ -40,9 +41,16 @@ jobs:
             - recursive: true
               args: [--frozen-lockfile, --strict-peer-dependencies]
             - args: [--filter @tarojs/components, -D, miniapp-types@latest]
+      # Note: 当前同步脚本使用 ts-node 与 node20 存在兼容问题，修复后解除版本限制
+      - name: Setup Node 16
+        uses: actions/setup-node@v4
+        with:
+          node-version: 16
+          cache: 'pnpm'
+          registry-url: 'https://registry.npmjs.org' # Don't touch!
 
       - name: build
-        run: pnpm build
+        run: pnpm --filter=@tarojs/components... build
 
       - name: execute sync script
         run: |

diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-arm64",
   "description": "Native binding for taro",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "os": [
     "darwin"
   ],

diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-x64",
   "description": "Native binding for taro",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "os": [
     "darwin"
   ],

diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-linux-x64-gnu",
   "description": "Native binding for taro",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "os": [
     "linux"
   ],

diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-win32-x64-msvc",
   "description": "Native binding for taro",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "main": "index.js",
   "keywords": [

diff --git a/packages/postcss-unit-transform/package.json b/packages/postcss-unit-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-taro-unit-transform",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "小程序单位转换",
   "main": "index.js",
   "scripts": {

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

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.22",
+  "version": "3.6.23",
   "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.22",
+  "version": "3.6.23",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/packages/taro-alipay/package.json b/packages/taro-alipay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-alipay",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "支付宝小程序平台插件",
   "author": "Chen-jj",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-alipay#readme",

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

diff --git a/packages/taro-cli-convertor/package.json b/packages/taro-cli-convertor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli-convertor",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "cli tool for taro-convert",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-cli-convertor/src/index.ts b/packages/taro-cli-convertor/src/index.ts
@@ -1805,9 +1805,9 @@ ${code}
     ps.push(creator.createFileFromTemplate(templateName, 'config/dev.js', 'config/dev.js', createOpts))
     ps.push(creator.createFileFromTemplate(templateName, 'config/prod.js', 'config/prod.js', createOpts))
     ps.push(creator.createFileFromTemplate(templateName, 'project.config.json', 'project.config.json', createOpts))
-    ps.push(creator.createFileFromTemplate(templateName, '.gitignore', '.gitignore', createOpts))
-    ps.push(creator.createFileFromTemplate(templateName, '.editorconfig', '.editorconfig', createOpts))
-    ps.push(creator.createFileFromTemplate(templateName, '.eslintrc.js', '.eslintrc.js', createOpts))
+    ps.push(creator.createFileFromTemplate(templateName, '_gitignore', '.gitignore', createOpts))
+    ps.push(creator.createFileFromTemplate(templateName, '_editorconfig', '.editorconfig', createOpts))
+    ps.push(creator.createFileFromTemplate(templateName, '_eslintrc', '.eslintrc', createOpts))
     ps.push(creator.createFileFromTemplate(templateName, 'babel.config.js', 'babel.config.js', createOpts))
     ps.push(creator.createFileFromTemplate(templateName, 'src/index.html', 'src/index.html', createOpts))
     Promise.all(ps).then(() => {

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "cli tool for taro",
   "main": "index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-components-advanced/package.json b/packages/taro-components-advanced/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-react",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue2/package.json b/packages/taro-components-library-vue2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue2",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Taro 组件库 Vue2 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue3",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Taro 组件库 Vue3 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-react",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "",
   "main:h5": "src/index.js",
   "main": "dist/index.js",

diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-rn",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "多端解决方案基础组件（RN）",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Taro 组件库",
   "browser": "dist/index.js",
   "main:h5": "dist/index.js",

diff --git a/packages/taro-components/scripts/json-schema-to-types.ts b/packages/taro-components/scripts/json-schema-to-types.ts
@@ -123,7 +123,7 @@ class GenerateTypes {
             const isIgnore = value.indexOf('@ignore') !== -1
 
             // 保留内置类型
-            const inherentTypes = ['global', 'h5', 'rn', 'quickapp', 'harmony']
+            const inherentTypes = ['global', 'h5', 'rn', 'quickapp', 'harmony', 'harmony_hybrid']
             inherentTypes.forEach((type) => {
               if (preSupportedPlatforms?.includes(type)) {
                 supportedPlatforms.push(type)

diff --git a/packages/taro-components/types/Input.d.ts b/packages/taro-components/types/Input.d.ts
@@ -7,6 +7,7 @@ interface InputProps extends StandardProps, FormItemProps {
   value?: string
   /** 设置 React 非受控输入框的初始内容
    * @supported weapp, alipay, swan, tt, qq, jd, h5, rn
+   * @unique
    */
   defaultValue?: string
   /** input 的类型

diff --git a/packages/taro-components/types/Map.d.ts b/packages/taro-components/types/Map.d.ts
@@ -637,7 +637,6 @@ declare namespace MapProps {
     longitude: number
     latitude: number
   }
-
   interface onPolylineTapEventDetail {
     polylineId: number
     longitude: number
@@ -648,7 +647,6 @@ declare namespace MapProps {
     errCode: number
     errMsg: string
   }
-
   interface onInterpolatePointEventDetail {
     markerId: number
     longitude: number

diff --git a/packages/taro-components/types/PickerView.d.ts b/packages/taro-components/types/PickerView.d.ts
@@ -7,6 +7,7 @@ interface PickerViewProps extends StandardProps {
   value?: number[]
   /** 设置 React 非受控状态下的初始取值
    * @supported weapp, alipay, swan, tt, qq, jd, rn
+   * @unique
    */
   defaultValue?: number[]
   /** 设置选择器中间选中框的样式

diff --git a/packages/taro-components/types/ShareElement.d.ts b/packages/taro-components/types/ShareElement.d.ts
@@ -8,6 +8,7 @@ interface ShareElementProps extends StandardProps {
   key?: string
   /** 映射标记
    * @supported weapp
+   * @unique
    */
   mapkey?: string
   /** 映射标记

diff --git a/packages/taro-components/types/Slider.d.ts b/packages/taro-components/types/Slider.d.ts
@@ -28,6 +28,7 @@ interface SliderProps extends StandardProps, FormItemProps {
   value?: number
   /** 设置 React 非受控状态下的初始取值
    * @supported weapp, alipay, swan, tt, qq, jd, h5, rn
+   * @unique
    */
   defaultValue?: string
   /** 背景条的颜色（请使用 backgroundColor）

diff --git a/packages/taro-components/types/Swiper.d.ts b/packages/taro-components/types/Swiper.d.ts
@@ -28,7 +28,7 @@ interface SwiperProps extends StandardProps {
   current?: number
   /** 当前所在滑块的 item-id ，不能与 current 被同时指定
    * @default ""
-   * @supported tt
+   * @supported swan, tt, qq, jd
    * @weapp deprecated
    */
   currentItemId?: string

diff --git a/packages/taro-components/types/Switch.d.ts b/packages/taro-components/types/Switch.d.ts
@@ -8,6 +8,7 @@ interface SwitchProps extends StandardProps, FormItemProps {
   checked?: boolean
   /** 设置在 React 非受控状态下，当前是否选中
    * @supported weapp, alipay, swan, tt, qq, jd, h5, rn
+   * @unique
    */
   defaultChecked?: boolean
   /** 是否禁用

diff --git a/packages/taro-components/types/Textarea.d.ts b/packages/taro-components/types/Textarea.d.ts
@@ -7,6 +7,7 @@ interface TextareaProps extends StandardProps, FormItemProps {
   value?: string
   /** 设置 React 非受控输入框的初始内容
    * @supported weapp, alipay, swan, tt, qq, jd, h5, rn
+   * @unique
    */
   defaultValue?: string
   /** 输入框为空时占位符

diff --git a/packages/taro-components/types/Video.d.ts b/packages/taro-components/types/Video.d.ts
@@ -315,7 +315,7 @@ interface VideoProps extends StandardProps {
   onTimeUpdate?: CommonEventFunction<VideoProps.onTimeUpdateEventDetail>
   /** 当视频进入和退出全屏时触发
    *
-   * @supported alipay, h5, rn, harmony_hybrid
+   * @supported h5, rn, harmony_hybrid
    */
   onFullscreenChange?: CommonEventFunction<VideoProps.onFullscreenChangeEventDetail>
   /** 视频出现缓冲时触发

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

diff --git a/packages/taro-h5/package.json b/packages/taro-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.6.22",
+  "version": "3.6.23",
   "description": "Taro h5 framework",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",