From d5de76d6410f6d87660f636b5ebf4ae5c19ad4d7 Mon Sep 17 00:00:00 2001 From: bigMeow Date: Tue, 15 Aug 2023 10:46:05 +0800 Subject: [PATCH 01/26] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E7=B3=BB=E5=B0=8F=E7=A8=8B=E5=BA=8Frequest=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E8=A7=A6=E5=8F=91=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/runtime/XMLHttpRequest.ts | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/packages/taro-plugin-http/src/runtime/XMLHttpRequest.ts b/packages/taro-plugin-http/src/runtime/XMLHttpRequest.ts index cb60a2ac34e0..aad96c137e13 100644 --- a/packages/taro-plugin-http/src/runtime/XMLHttpRequest.ts +++ b/packages/taro-plugin-http/src/runtime/XMLHttpRequest.ts @@ -118,7 +118,10 @@ export class XMLHttpRequest extends Events { #withCredentials: boolean #requestTask: null | Taro.RequestTask - // 事件 + // 事件正常流转： loadstart => progress（可能多次） => load => loadend + // error 流转： loadstart => error => loadend + // abort 流转： loadstart => abort => loadend + // web在线测试： https://developer.mozilla.org/zh-CN/play /** 当 request 被停止时触发，例如当程序调用 XMLHttpRequest.abort() 时 */ onabort: ((e: XMLHttpRequestEvent) => void) | null = null @@ -309,8 +312,30 @@ export class XMLHttpRequest extends Events { * 请求失败 */ #requestFail (err) { - this.#status = 0 - this.#statusText = err.errMsg + // 微信小程序，无论接口返回200还是其他，响应无论是否有错误，都会进入 success 回调；只有类似超时这种请求错误才会进入 fail 回调 + // + /** + * 阿里系小程序，接口返回非200状态码，会进入 fail 回调, 此时 err 对象结构如下（当错误码为 14 或 19 时，会多返回 status、data、headers。可通过这些字段获取服务端相关错误信息）： + { + data: "{\"code\": 401,\"msg\":\"登录过期，请重新登录\"}" + error: 19 + errorMessage: "http status error" + headers: {date: 'Mon, 14 Aug 2023 08:54:58 GMT', content-type: 'application/json;charset=UTF-8', content-length: '52', connection: 'close', access-control-allow-credentials: 'true', …} + originalData: "{\"code\": 401,\"msg\":\"登录过期，请重新登录\"}" + status: 401 + } + */ + // 统一行为，能正常响应的，都算 success. + if (err.status) { + this.#requestSuccess({ + data: err, + statusCode: err.status, + header: err.headers + }) + return + } + this.#status = 0 + this.#statusText = err.errMsg || err.errorMessage const errorEvent = createXMLHttpRequestEvent('error', this, 0) this.trigger('error', errorEvent) isFunction(this.onerror) && this.onerror(errorEvent) From 991496cc6e4f083c6d6a93e07a8233b1e3c1a621 Mon Sep 17 00:00:00 2001 From: bigMeow Date: Tue, 15 Aug 2023 10:49:20 +0800 Subject: [PATCH 02/26] chore(release): publish 3.6.13-alpha.2 --tag=alpha --- package.json | 2 +- .../package.json | 2 +- packages/babel-plugin-transform-taroapi/package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- packages/postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/shared/package.json | 2 +- packages/stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/taro-alipay/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- packages/taro-components-advanced/package.json | 2 +- packages/taro-components-library-react/package.json | 2 +- packages/taro-components-library-vue2/package.json | 2 +- packages/taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-extend/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-helper/package.json | 2 +- packages/taro-jd/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-mini-runner/package.json | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- packages/taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-react/package.json | 2 +- packages/taro-plugin-vue-devtools/package.json | 2 +- packages/taro-plugin-vue2/package.json | 2 +- packages/taro-plugin-vue3/package.json | 2 +- packages/taro-qq/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- packages/taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-swan/package.json | 2 +- packages/taro-tt/package.json | 2 +- packages/taro-weapp/package.json | 2 +- packages/taro-webpack-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- packages/taroize/package.json | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index b17256af41da..d5af24ca577d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "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 index c5f164f3b378..640d85f5678a 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 273af0b0a9b4..29716798baee 100644 --- 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.12", + "version": "3.6.13-alpha.2", "main": "dist/index.js", "scripts": { "build": "tsc", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index 1fdafa876ead..76b6cab344d2 100644 --- 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.12", + "version": "3.6.13-alpha.2", "description": "Taro babel preset", "author": "yuche ", "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 index ec1598e51745..69a3ec8b945b 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/create-app", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "create taro app with one command", "author": "VincentW ", "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 index 87e3585e893a..6caea7867554 100644 --- 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.12", + "version": "3.6.13-alpha.2", "main": "dist/index.js", "license": "MIT", "files": [ diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json index b05795813419..0f5c4254917c 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index b474c11feb6e..859b3a7a94e9 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 17bf3852cc65..d50e87b20dd4 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 902f4ded328d..1934690bb84d 100644 --- a/packages/postcss-pxtransform/package.json +++ b/packages/postcss-pxtransform/package.json @@ -1,6 +1,6 @@ { "name": "postcss-pxtransform", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位", "main": "index.js", "keywords": [ diff --git a/packages/shared/package.json b/packages/shared/package.json index 0f763fad62f0..6bd8872848e3 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/shared", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro utils internal use.", "author": "yuche ", "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 index 08b2409adb59..8266ca94d300 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 331f5414d58c..d504c291d5d5 100644 --- 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.12", + "version": "3.6.13-alpha.2", "main": "dist/index.js", "files": [ "dist", diff --git a/packages/taro-alipay/package.json b/packages/taro-alipay/package.json index 1ea58ad6fe9b..8a5d1de23f9c 100644 --- a/packages/taro-alipay/package.json +++ b/packages/taro-alipay/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-alipay", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "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 index c9b55f4a2c9b..fce6209f3290 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro common API", "author": "yuche ", "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 index 57fe4b08abad..85180e9b4798 100644 --- 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.12", + "version": "3.6.13-alpha.2", "description": "cli tool for taro-convert", "main": "index.js", "scripts": { diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json index 24e5f3d8af55..ab8b75126c37 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "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 index 7521daeefb31..705656fe5097 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 1bfa0051290b..8f027e766e14 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 68921e16c4f6..57858854ce90 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 91b63097c596..c3a444179356 100644 --- 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.12", + "version": "3.6.13-alpha.2", "description": "Taro 组件库 Vue3 版本库", "private": true, "main": "index.js", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 32437da04e29..489b860186cb 100644 --- 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.12", + "version": "3.6.13-alpha.2", "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 index 310b69c73bab..c56a3910eaa3 100644 --- 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.12", + "version": "3.6.13-alpha.2", "description": "多端解决方案基础组件（RN）", "main": "./dist/index.js", "scripts": { diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index f7c9a234cee6..d6891eefa5f1 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 组件库", "browser": "dist/index.js", "main:h5": "dist/index.js", diff --git a/packages/taro-extend/package.json b/packages/taro-extend/package.json index 282ec7f2607a..1016886f19c5 100644 --- a/packages/taro-extend/package.json +++ b/packages/taro-extend/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/extend", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro extend functionality", "author": "yuche ", "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 index 9f6a2a163e4e..1486bba204d6 100644 --- a/packages/taro-h5/package.json +++ b/packages/taro-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-h5", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro h5 framework", "browser": "dist/index.esm.js", "main:h5": "dist/index.js", diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json index 657b18ad0c82..ce2dd80770b1 100644 --- a/packages/taro-helper/package.json +++ b/packages/taro-helper/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/helper", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro Helper", "main": "index.js", "types": "dist/index.d.ts", diff --git a/packages/taro-jd/package.json b/packages/taro-jd/package.json index 0262cadbd778..fc45d2819e0b 100644 --- a/packages/taro-jd/package.json +++ b/packages/taro-jd/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-jd", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "京东小程序平台插件", "author": "Chen-jj", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-jd#readme", diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json index f6768b9a4eb6..48714c44394b 100644 --- a/packages/taro-loader/package.json +++ b/packages/taro-loader/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-loader", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro runner use webpack loader", "author": "yuche ", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme", diff --git a/packages/taro-mini-runner/package.json b/packages/taro-mini-runner/package.json index 9e62d6d8eada..6654da1659a7 100644 --- a/packages/taro-mini-runner/package.json +++ b/packages/taro-mini-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/mini-runner", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Mini app runner for taro", "main": "index.js", "scripts": { diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index 2627d2ccdcc3..caa832d10bc3 100644 --- a/packages/taro-platform-h5/package.json +++ b/packages/taro-platform-h5/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-h5", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Web 端平台插件", "author": "ZakaryCode", "license": "MIT", diff --git a/packages/taro-plugin-html/package.json b/packages/taro-plugin-html/package.json index 67e1607796f9..ab8f0ecc4337 100644 --- a/packages/taro-plugin-html/package.json +++ b/packages/taro-plugin-html/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-html", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端支持使用 HTML 标签的插件", "main": "index.js", "scripts": { diff --git a/packages/taro-plugin-http/package.json b/packages/taro-plugin-http/package.json index 7e421664ec71..f73b1645dab9 100644 --- a/packages/taro-plugin-http/package.json +++ b/packages/taro-plugin-http/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-http", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端支持使用 web 请求 的插件", "main": "index.js", "scripts": { diff --git a/packages/taro-plugin-inject/package.json b/packages/taro-plugin-inject/package.json index 95210197c524..94042abe8eba 100644 --- a/packages/taro-plugin-inject/package.json +++ b/packages/taro-plugin-inject/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-inject", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端平台中间层插件", "author": "luckyadam", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-plugin-mini-ci/package.json b/packages/taro-plugin-mini-ci/package.json index a08681117cab..9b81836693aa 100644 --- a/packages/taro-plugin-mini-ci/package.json +++ b/packages/taro-plugin-mini-ci/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-mini-ci", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端构建后支持CI（持续集成）的插件", "keywords": [ "Taro", diff --git a/packages/taro-plugin-react-devtools/package.json b/packages/taro-plugin-react-devtools/package.json index 0642fc843285..518e4e7b9032 100644 --- a/packages/taro-plugin-react-devtools/package.json +++ b/packages/taro-plugin-react-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-react-devtools", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端支持使用 React DevTools 的插件", "main": "index.js", "scripts": { diff --git a/packages/taro-plugin-react/package.json b/packages/taro-plugin-react/package.json index b0c6f2607bcd..3c44ecb2898a 100644 --- a/packages/taro-plugin-react/package.json +++ b/packages/taro-plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-react", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "React/Preact/Nerv 框架插件", "author": "drchan", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-plugin-vue-devtools/package.json b/packages/taro-plugin-vue-devtools/package.json index d8a5e0112bc9..f86c31d2e970 100644 --- a/packages/taro-plugin-vue-devtools/package.json +++ b/packages/taro-plugin-vue-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-vue-devtools", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro 小程序端支持使用 Vue DevTools 的插件", "main": "index.js", "scripts": { diff --git a/packages/taro-plugin-vue2/package.json b/packages/taro-plugin-vue2/package.json index 0db6a8d75996..ad792bc4816e 100644 --- a/packages/taro-plugin-vue2/package.json +++ b/packages/taro-plugin-vue2/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-vue2", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Vue2 框架插件", "author": "drchan", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-plugin-vue3/package.json b/packages/taro-plugin-vue3/package.json index bf32fd8c2346..c38e10a2250a 100644 --- a/packages/taro-plugin-vue3/package.json +++ b/packages/taro-plugin-vue3/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-framework-vue3", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Vue3 框架插件", "author": "drchan", "homepage": "https://github.com/nervjs/taro", diff --git a/packages/taro-qq/package.json b/packages/taro-qq/package.json index 5d4254cc10d7..7b5892b309c1 100644 --- a/packages/taro-qq/package.json +++ b/packages/taro-qq/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-qq", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "QQ 小程序平台插件", "author": "Chen-jj", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-qq#readme", diff --git a/packages/taro-react/package.json b/packages/taro-react/package.json index c3b637982041..97eb36e584a9 100644 --- a/packages/taro-react/package.json +++ b/packages/taro-react/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/react", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "like react-dom, but for mini apps.", "author": "yuche ", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-react#readme", diff --git a/packages/taro-rn-runner/package.json b/packages/taro-rn-runner/package.json index 6343dcbb580c..a3d33c864a3d 100644 --- a/packages/taro-rn-runner/package.json +++ b/packages/taro-rn-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-runner", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "ReactNative build tool for taro", "main": "index.js", "repository": { diff --git a/packages/taro-rn-style-transformer/package.json b/packages/taro-rn-style-transformer/package.json index 3d7cb3013f0d..625520606d6e 100644 --- a/packages/taro-rn-style-transformer/package.json +++ b/packages/taro-rn-style-transformer/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-style-transformer", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "提供Taro RN 统一处理样式文件能力", "main": "dist/index.js", "scripts": { diff --git a/packages/taro-rn-supporter/package.json b/packages/taro-rn-supporter/package.json index 985a439c35e2..badca7fdbf81 100644 --- a/packages/taro-rn-supporter/package.json +++ b/packages/taro-rn-supporter/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-supporter", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro rn supporter", "main": "dist/index.js", "scripts": { diff --git a/packages/taro-rn-transformer/package.json b/packages/taro-rn-transformer/package.json index d1a1fa608e09..b826c2a5b0b3 100644 --- a/packages/taro-rn-transformer/package.json +++ b/packages/taro-rn-transformer/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/rn-transformer", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro RN 入口文件处理", "main": "dist/index.js", "types": "./src/types/index.d.ts", diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json index a5e6a076b4ff..2ae2a86bbbcd 100644 --- a/packages/taro-rn/package.json +++ b/packages/taro-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro-rn", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro RN framework", "main": "dist/index.js", "typings": "types/index.d.ts", diff --git a/packages/taro-router-rn/package.json b/packages/taro-router-rn/package.json index 7c7c0539e930..b3284e143cb7 100644 --- a/packages/taro-router-rn/package.json +++ b/packages/taro-router-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router-rn", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro-router-rn", "main": "dist/index.js", "typings": "src/index.ts", diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json index 0c66d9a43c8c..5c84bf5d79f2 100644 --- a/packages/taro-router/package.json +++ b/packages/taro-router/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/router", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro-router", "browser": "dist/index.esm.js", "main:h5": "dist/index.js", diff --git a/packages/taro-runner-utils/package.json b/packages/taro-runner-utils/package.json index 68f19369c81b..180bcccf6861 100644 --- a/packages/taro-runner-utils/package.json +++ b/packages/taro-runner-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runner-utils", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro runner utilities.", "main": "dist/index.js", "types": "types/index.d.ts", diff --git a/packages/taro-runtime-rn/package.json b/packages/taro-runtime-rn/package.json index 5ee58335201b..421950942689 100644 --- a/packages/taro-runtime-rn/package.json +++ b/packages/taro-runtime-rn/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime-rn", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "taro-runtime-rn", "main": "dist/index.js", "types": "./src/index.ts", diff --git a/packages/taro-runtime/package.json b/packages/taro-runtime/package.json index 0e02c9c2a036..52865ea45685 100644 --- a/packages/taro-runtime/package.json +++ b/packages/taro-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/runtime", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "taro runtime for mini apps.", "main": "dist/runtime.esm.js", "module": "dist/runtime.esm.js", diff --git a/packages/taro-service/package.json b/packages/taro-service/package.json index 3f82d0e3b106..622b9d97d24d 100644 --- a/packages/taro-service/package.json +++ b/packages/taro-service/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/service", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro Service", "main": "index.js", "types": "types/index.d.ts", diff --git a/packages/taro-swan/package.json b/packages/taro-swan/package.json index 9c4789676181..9ca5343f6d68 100644 --- a/packages/taro-swan/package.json +++ b/packages/taro-swan/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-swan", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "百度小程序平台插件", "author": "Chen-jj", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-swan#readme", diff --git a/packages/taro-tt/package.json b/packages/taro-tt/package.json index bac617207c6b..1377dae2c9c0 100644 --- a/packages/taro-tt/package.json +++ b/packages/taro-tt/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-tt", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "头条小程序平台插件", "author": "Chen-jj", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-tt#readme", diff --git a/packages/taro-weapp/package.json b/packages/taro-weapp/package.json index ba7b60a1f160..ec06375d825e 100644 --- a/packages/taro-weapp/package.json +++ b/packages/taro-weapp/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-weapp", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "微信小程序平台插件", "author": "drchan", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-weapp#readme", diff --git a/packages/taro-webpack-runner/package.json b/packages/taro-webpack-runner/package.json index 468d3df82d80..d9ceab6dd663 100644 --- a/packages/taro-webpack-runner/package.json +++ b/packages/taro-webpack-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/webpack-runner", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "webpack runner for taro", "main": "index.js", "scripts": { diff --git a/packages/taro-webpack5-prebundle/package.json b/packages/taro-webpack5-prebundle/package.json index b02ea7d27bc3..e9fbf6a85817 100644 --- a/packages/taro-webpack5-prebundle/package.json +++ b/packages/taro-webpack5-prebundle/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/webpack5-prebundle", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro app webpack5 prebundle", "main": "dist/index.js", "scripts": { diff --git a/packages/taro-webpack5-runner/package.json b/packages/taro-webpack5-runner/package.json index 3eb9d66a89ee..926408ec1ef2 100644 --- a/packages/taro-webpack5-runner/package.json +++ b/packages/taro-webpack5-runner/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/webpack5-runner", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro app runner", "main": "index.js", "scripts": { diff --git a/packages/taro-with-weapp/package.json b/packages/taro-with-weapp/package.json index d1df93d29017..537773badd71 100644 --- a/packages/taro-with-weapp/package.json +++ b/packages/taro-with-weapp/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/with-weapp", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "taroize 之后的运行时", "main": "index.js", "files": [ diff --git a/packages/taro/package.json b/packages/taro/package.json index 6b98b1ea9eba..7f9bec1e995b 100644 --- a/packages/taro/package.json +++ b/packages/taro/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taro", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "Taro framework", "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro#readme", "main": "index.js", diff --git a/packages/taroize/package.json b/packages/taroize/package.json index a13df5574867..7248bd9ec6a4 100644 --- a/packages/taroize/package.json +++ b/packages/taroize/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/taroize", - "version": "3.6.12", + "version": "3.6.13-alpha.2", "description": "转换原生微信小程序代码为 Taro 代码", "main": "index.js", "files": [ From 134f7ef804f2ae514652a0c1858613abb076b231 Mon Sep 17 00:00:00 2001 From: zhangjunfeng5 Date: Wed, 23 Aug 2023 16:03:06 +0800 Subject: [PATCH 03/26] =?UTF-8?q?feat:=20=E4=BA=AC=E4=B8=9C=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8FCI=E6=96=B0=E5=A2=9Erobot=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-plugin-mini-ci/README.md | 15 +++++++++++++++ packages/taro-plugin-mini-ci/src/BaseCi.ts | 5 +++++ packages/taro-plugin-mini-ci/src/JdCI.ts | 13 ++++++++----- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/packages/taro-plugin-mini-ci/README.md b/packages/taro-plugin-mini-ci/README.md index 8d481d71474a..e83dc0c9dec0 100644 --- a/packages/taro-plugin-mini-ci/README.md +++ b/packages/taro-plugin-mini-ci/README.md @@ -41,6 +41,9 @@ const CIPluginOpt = { swan: { token: '鉴权需要的token令牌', }, + jd: { + privateKey: '京东小程序秘钥' + } // 版本号 version: '1.0.0', // 版本发布描述 @@ -81,6 +84,9 @@ const CIPluginFn = async () => { swan: { token: "鉴权需要的token令牌" }, + jd: { + privateKey: '京东小程序秘钥' + } // 版本号 version: "1.0.0", // 版本发布描述 @@ -377,6 +383,8 @@ health: 阿里医院 | 参数 | 类型 | 说明 | | :--------- | :----- | :--------- | | privateKey | string | 秘钥字符串 | +| robot | number | 指定使用哪一个 ci 机器人，可选值：1 ~ 30 | +| ignores | string[] | 指定需要排除的规则。无需配置以“.”开头的隐藏文件，它们将默认被忽略，如“.git” | 官方 CI 文档[点这里](https://mp-docs.jd.com/doc/dev/devtools/1597) @@ -400,6 +408,8 @@ export interface CIOptions { dd?: DingtalkConfig /** 百度小程序配置, 官方文档地址：https://smartprogram.baidu.com/docs/develop/devtools/commandtool/ */ swan?: SwanConfig + /** 京东小程序配置, 官方文档地址：https://mp-docs.jd.com/doc/dev/devtools/1597 */ + jd?: JdConfig } export type ProjectType = 'miniProgram' | 'miniGame' | 'miniProgramPlugin' | 'miniGamePlugin' @@ -523,6 +533,11 @@ export interface SwanConfig { /** 京东小程序配置 */ export interface JdConfig { + /** 秘钥信息 */ privateKey: string + /** 指定使用哪一个 ci 机器人，可选值：1 ~ 30 */ + robot?: number + /** 指定需要排除的规则。无需配置以“.”开头的隐藏文件，它们将默认被忽略，如“.git” */ + ignores?: string[] } ``` diff --git a/packages/taro-plugin-mini-ci/src/BaseCi.ts b/packages/taro-plugin-mini-ci/src/BaseCi.ts index b63dc413e5d4..5cc269dc10e1 100644 --- a/packages/taro-plugin-mini-ci/src/BaseCi.ts +++ b/packages/taro-plugin-mini-ci/src/BaseCi.ts @@ -118,7 +118,12 @@ export interface SwanConfig { } export interface JdConfig { + /** 秘钥信息 */ privateKey: string + /** 指定使用哪一个 ci 机器人，可选值：1 ~ 30 */ + robot?: number + /** 指定需要排除的规则。无需配置以“.”开头的隐藏文件，它们将默认被忽略，如“.git” */ + ignores?: string[] } export interface CIOptions { diff --git a/packages/taro-plugin-mini-ci/src/JdCI.ts b/packages/taro-plugin-mini-ci/src/JdCI.ts index ae65af9079a2..a5b8fc800646 100644 --- a/packages/taro-plugin-mini-ci/src/JdCI.ts +++ b/packages/taro-plugin-mini-ci/src/JdCI.ts @@ -24,7 +24,7 @@ export default class JdCI extends BaseCI { } async preview () { - const { privateKey } = this.pluginOpts.jd! + const { privateKey, ignores } = this.pluginOpts.jd! const { chalk, printLog, processTypeEnum } = this.ctx.helper const previewQrcodePath = join(this.projectPath, 'preview.jpg') @@ -35,8 +35,9 @@ export default class JdCI extends BaseCI { desc: this.desc, privateKey, projectPath: this.projectPath, - uv: this.version, // 版本号和备注京东小程序暂不支持，后续优化 - qrcodeFormat: 'image' + uv: this.version, + qrcodeFormat: 'image', + ignores, }) const qrcodeContent = await readQrcodeImageContent(result.imgUrl) @@ -67,7 +68,7 @@ export default class JdCI extends BaseCI { } async upload () { - const { privateKey } = this.pluginOpts.jd! + const { privateKey, robot, ignores } = this.pluginOpts.jd! const { chalk, printLog, processTypeEnum } = this.ctx.helper const uploadQrcodePath = join(this.projectPath, 'upload.jpg') @@ -77,8 +78,10 @@ export default class JdCI extends BaseCI { desc: this.desc, privateKey, projectPath: this.projectPath, - uv: this.version, // 版本号和备注京东小程序暂不支持，后续优化 + uv: this.version, qrcodeFormat: 'image', + robot, + ignores, }) const qrcodeContent = await readQrcodeImageContent(result.imgUrl) From ab4f87ca045311a0f45adc93d9c25c99e8ff8f03 Mon Sep 17 00:00:00 2001 From: tangcq-code <57692251+tangcq-code@users.noreply.github.com> Date: Thu, 31 Aug 2023 15:51:42 +0800 Subject: [PATCH 04/26] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0exitFullScreen?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=8C=E9=80=82=E9=85=8D=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84webkit=20(#14459)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-components/src/components/video/video.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/taro-components/src/components/video/video.tsx b/packages/taro-components/src/components/video/video.tsx index f1d9699e7507..cdf3467f3711 100644 --- a/packages/taro-components/src/components/video/video.tsx +++ b/packages/taro-components/src/components/video/video.tsx @@ -451,7 +451,7 @@ export class Video implements ComponentInterface { } @Method() - async getHlsObject() { + async getHlsObject () { // Note: H5 端专属方法，获取 HLS 实例 fix #11894 return this.hls } @@ -547,6 +547,8 @@ export class Video implements ComponentInterface { setTimeout(() => { this.videoRef[screenFn.requestFullscreen]({ navigationUI: 'auto' }) }, 0) + } else { + document[screenFn.exitFullscreen]() } } From 77e93157327ddabce54c8831f37e22c284439f29 Mon Sep 17 00:00:00 2001 From: zhangjunfeng5 Date: Mon, 4 Sep 2023 10:14:17 +0800 Subject: [PATCH 05/26] =?UTF-8?q?feat:=20=E4=BA=AC=E4=B8=9C=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8Fci=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-plugin-mini-ci/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/taro-plugin-mini-ci/src/index.ts b/packages/taro-plugin-mini-ci/src/index.ts index 6c448742e7c7..8a70d1fe74ac 100644 --- a/packages/taro-plugin-mini-ci/src/index.ts +++ b/packages/taro-plugin-mini-ci/src/index.ts @@ -99,6 +99,8 @@ export default (ctx: IPluginContext, _pluginOpts: CIOptions | (() => CIOptions)) }), jd: joi.object({ privateKey: joi.string().required(), + robot: joi.number(), + ignores: joi.array().items(joi.string()), }), version: joi.string(), desc: joi.string(), From 9e889454a5822a716b30e27bfb54373657a8f8c4 Mon Sep 17 00:00:00 2001 From: ZakaryCode Date: Sat, 2 Sep 2023 00:13:18 +0000 Subject: [PATCH 06/26] refactor(types): sync components types --- packages/taro-components/types/Button.d.ts | 6 +++++- packages/taro/types/api/taro.extend.d.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/taro-components/types/Button.d.ts b/packages/taro-components/types/Button.d.ts index ed54669c6af2..1a05b830b7fc 100644 --- a/packages/taro-components/types/Button.d.ts +++ b/packages/taro-components/types/Button.d.ts @@ -297,7 +297,11 @@ declare namespace ButtonProps { reset } /** open-type 的合法值 */ - type OpenType = keyof openTypeKeys['weapp'] | keyof openTypeKeys['alipay'] | keyof openTypeKeys['qq'] | keyof openTypeKeys['tt'] + type OpenType = + | keyof openTypeKeys['weapp'] + | keyof openTypeKeys['alipay'] + | keyof openTypeKeys['qq'] + | keyof openTypeKeys['tt'] /** open-type 的合法值 */ interface openTypeKeys { weapp: { diff --git a/packages/taro/types/api/taro.extend.d.ts b/packages/taro/types/api/taro.extend.d.ts index 6c47409643ef..eaf99c83f57c 100644 --- a/packages/taro/types/api/taro.extend.d.ts +++ b/packages/taro/types/api/taro.extend.d.ts @@ -83,7 +83,7 @@ declare module '../index' { /** 尺寸转换 * @supported global */ - pxTransform(size: number, designWidth?: number): string + pxTransform(size: number): string /** 尺寸转换初始化 * @supported global From 78a16c45aded0191c24c0955179b036d30e2cab3 Mon Sep 17 00:00:00 2001 From: xuanzebin <38971117+xuanzebin@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:41:22 +0800 Subject: [PATCH 07/26] =?UTF-8?q?fix(mini):=20=E4=BF=AE=E5=A4=8D=20webpack?= =?UTF-8?q?4=20=E4=B8=AD=20wxml=20=E5=92=8C=20wxs=20=E7=9A=84=20loader=20?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98=20(#14427)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(mini): 修复 webpack4 wxml 和 wxs 的 loader 路径问题 * test(snapshot): 更新测试快照 * feat: 路径修复兼容 window --------- Co-authored-by: xuanzebin --- .../__snapshots__/wx-hybrid.spec.ts.snap | 26 ++++++++--------- .../taro-mini-runner/src/webpack/chain.ts | 28 +++++++++++++++++-- .../src/webpack/MiniWebpackModule.ts | 4 +-- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap index 67db6ef939fc..c2835d999484 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap @@ -1467,6 +1467,12 @@ require("./taro"); /** filePath: dist/components/tab/tab.json **/ {"component":true,"usingComponents":{}} +/** filePath: dist/components/tab/tab.wxml **/ + + {{myProperty}} + + + /** filePath: dist/pages/index/index.js **/ (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 11 ], { 17: function(module, exports, __webpack_require__) {}, @@ -1605,25 +1611,19 @@ require("./taro"); /** filePath: dist/pages/native/native.json **/ {"navigationBarBackgroundColor":"#ffffff","navigationBarTextStyle":"black","navigationBarTitleText":"混写页面示例","backgroundColor":"#eeeeee","backgroundTextStyle":"light","usingComponents":{"tab":"../../components/tab/tab"}} -/** filePath: dist/pages/native/native.wxss **/ -.native{color:red} - -/** filePath: dist/runtime.js **/ - - -/** filePath: dist/src/components/tab/tab.wxml **/ - - {{myProperty}} - - - -/** filePath: dist/src/pages/native/native.wxml **/ +/** filePath: dist/pages/native/native.wxml **/ {{text}}{{x}} +/** filePath: dist/pages/native/native.wxss **/ +.native{color:red} + +/** filePath: dist/runtime.js **/ + + /** filePath: dist/taro.js **/ (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 1 ], { 2: function(module, __webpack_exports__, __webpack_require__) { diff --git a/packages/taro-mini-runner/src/webpack/chain.ts b/packages/taro-mini-runner/src/webpack/chain.ts index f6338e38d032..f6168aef6d91 100644 --- a/packages/taro-mini-runner/src/webpack/chain.ts +++ b/packages/taro-mini-runner/src/webpack/chain.ts @@ -433,8 +433,26 @@ export const getModule = (appPath: string, { test: REG_TEMPLATE, use: [getFileLoader([{ useRelativePath: true, - name: (resourcePath) => { - return resourcePath.replace(path.join(sourceDir, '../'), '').replace(/node_modules/gi, 'npm') + name: (resourcePath: string) => { + // 差异点： + // webpack4 中的 resourcePath 是绝对路径 + // webpack5 中的 filename 是相对于 appPath 的文件路径名称 + // appPath /xxx/uuu/aaa + // sourceDir /xxx/uuu/aaa/bbb/ccc/src + + // 因此在 webpack4 中如果包含 sourceDir，证明是在 src 内的路径 + if (resourcePath.includes(sourceDir)) { + // 直接将 /xxx/src/yyy/zzz.wxml 转换成 yyy/zzz.wxml 即可 + return resourcePath.replace(sourceDir + path.sep, '').replace(/node_modules/gi, 'npm') + } else { + // 否则，证明是外层，存在一下两种可能 + // resourcePath /xxx/uuu/aaa/node_modules/yy/zzz.wxml + // --> result: npm/yy/zzz.wxml + + // resourcePath /xxx/uuu/aaa/bbb/abc/yy/zzz.wxml + // --> result: bbb/abc/yy/zzz.wxml + return resourcePath.replace(appPath + path.sep, '').replace(/node_modules/gi, 'npm') + } }, context: sourceDir }]), miniTemplateLoader] @@ -444,7 +462,11 @@ export const getModule = (appPath: string, { use: [getFileLoader([{ useRelativePath: true, name: (resourcePath) => { - return resourcePath.replace(path.join(sourceDir, '../'), '').replace(/node_modules/gi, 'npm') + if (resourcePath.includes(sourceDir)) { + return resourcePath.replace(sourceDir + path.sep, '').replace(/node_modules/gi, 'npm') + } else { + return resourcePath.replace(appPath + path.sep, '').replace(/node_modules/gi, 'npm') + } }, context: sourceDir }]), diff --git a/packages/taro-webpack5-runner/src/webpack/MiniWebpackModule.ts b/packages/taro-webpack5-runner/src/webpack/MiniWebpackModule.ts index 44e3ddba200e..68226fbd3b3c 100644 --- a/packages/taro-webpack5-runner/src/webpack/MiniWebpackModule.ts +++ b/packages/taro-webpack5-runner/src/webpack/MiniWebpackModule.ts @@ -92,7 +92,7 @@ export class MiniWebpackModule { generator: { filename ({ filename }) { const extname = path.extname(filename) - return filename.replace(sourceRoot + '/', '').replace(extname, fileType.templ).replace(/node_modules/gi, 'npm') + return filename.replace(sourceRoot + path.sep, '').replace(extname, fileType.templ).replace(/node_modules/gi, 'npm') } }, use: [WebpackModule.getLoader(path.resolve(__dirname, '../loaders/miniTemplateLoader'), { @@ -105,7 +105,7 @@ export class MiniWebpackModule { type: 'asset/resource', generator: { filename ({ filename }) { - return filename.replace(sourceRoot + '/', '').replace(/node_modules/gi, 'npm') + return filename.replace(sourceRoot + path.sep, '').replace(/node_modules/gi, 'npm') } }, use: [WebpackModule.getLoader(path.resolve(__dirname, '../loaders/miniXScriptLoader'))] From cf8b17975256c04d688d7c9e388605e4d9fd15e7 Mon Sep 17 00:00:00 2001 From: beezen <1184031131@qq.com> Date: Mon, 4 Sep 2023 17:37:44 +0800 Subject: [PATCH 08/26] =?UTF-8?q?fix(plugin-inject):=20=E4=BF=AE=E5=A4=8D@?= =?UTF-8?q?tarojs/plugin-inject=E9=85=8D=E7=BD=AE=E5=9C=A8H5=E7=AB=AF?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20(#1446?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(plugin-inject): 修复@tarojs/plugin-inject配置在H5端编译报错问题 * fix(plugin-inject): 优化 plugin-inject 逻辑执行判断 --------- Co-authored-by: Zakary --- packages/taro-plugin-inject/src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/taro-plugin-inject/src/index.ts b/packages/taro-plugin-inject/src/index.ts index 80b0a074ed41..b0ec7747340a 100644 --- a/packages/taro-plugin-inject/src/index.ts +++ b/packages/taro-plugin-inject/src/index.ts @@ -40,7 +40,8 @@ export default (ctx: IPluginContext, options: IOptions) => { } = options const template = platform.template - + if(!template) return + if (isArray(voidComponents)) { voidComponents.forEach(el => template.voidElements.add(el)) } else if (isFunction(voidComponents)) { From 208997a0f9c16d92a0d3a94990704c3b27754b85 Mon Sep 17 00:00:00 2001 From: konka <1094918@gmail.com> Date: Sun, 3 Sep 2023 16:19:04 +0800 Subject: [PATCH 09/26] fix(style): use 100% instandof 100vh There will be scrollbar if use min-height:100vh on Chrome. Better choice is use height:100%. --- .../taro-components/src/components/video/style/index.scss | 1 + packages/taro-components/src/global.css | 6 ++++++ packages/taro-router/src/style.ts | 1 - 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/taro-components/src/components/video/style/index.scss b/packages/taro-components/src/components/video/style/index.scss index 2b8df49f874e..1374ae1b7012 100644 --- a/packages/taro-components/src/components/video/style/index.scss +++ b/packages/taro-components/src/components/video/style/index.scss @@ -48,6 +48,7 @@ width: 100%; height: 100%; object-position: inherit; + display: block; } .taro-video-cover { diff --git a/packages/taro-components/src/global.css b/packages/taro-components/src/global.css index 0947babbae61..4146938c5232 100644 --- a/packages/taro-components/src/global.css +++ b/packages/taro-components/src/global.css @@ -1 +1,7 @@ @import url(../node_modules/weui/dist/style/weui.min.css); + +html, +body { + width: 100%; + height: 100%; +} diff --git a/packages/taro-router/src/style.ts b/packages/taro-router/src/style.ts index b8dfffcc06d1..c24302cd5603 100644 --- a/packages/taro-router/src/style.ts +++ b/packages/taro-router/src/style.ts @@ -35,7 +35,6 @@ export function loadRouterStyle (usingWindowScroll) { position: relative; width: 100%; height: 100%; - min-height: 100vh; } .taro-tabbar__container .taro_router { From b92f7df4cb51910022142a4893f8f8765833b175 Mon Sep 17 00:00:00 2001 From: TheKonka <1094918@gmail.com> Date: Tue, 5 Sep 2023 14:59:30 +0800 Subject: [PATCH 10/26] fix(style): remove min-height of taro_router in h5 tabbar page #14312 --- .../src/components/pull-down-refresh/style/index.css | 3 +-- .../src/components/pull-to-refresh/style/index.scss | 2 +- packages/taro-router/src/style.ts | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/taro-components-react/src/components/pull-down-refresh/style/index.css b/packages/taro-components-react/src/components/pull-down-refresh/style/index.css index 1bf4b43775cb..d1cb3897a111 100644 --- a/packages/taro-components-react/src/components/pull-down-refresh/style/index.css +++ b/packages/taro-components-react/src/components/pull-down-refresh/style/index.css @@ -2,14 +2,13 @@ transform-origin: left top 0px; } .rmc-pull-to-refresh-content-wrapper { - min-height: 100vh; + min-height: 100%; } .rmc-pull-to-refresh-transition { transition: transform 0.3s; } - @keyframes rmc-pull-to-refresh-indicator { 50% { opacity: 0.2; diff --git a/packages/taro-components/src/components/pull-to-refresh/style/index.scss b/packages/taro-components/src/components/pull-to-refresh/style/index.scss index e9ba9a22b831..4da1f4569617 100644 --- a/packages/taro-components/src/components/pull-to-refresh/style/index.scss +++ b/packages/taro-components/src/components/pull-to-refresh/style/index.scss @@ -3,7 +3,7 @@ } .rmc-pull-to-refresh-content-wrapper { - min-height: 100vh; + min-height: 100%; } .rmc-pull-to-refresh-transition { diff --git a/packages/taro-router/src/style.ts b/packages/taro-router/src/style.ts index c24302cd5603..37aec3d28601 100644 --- a/packages/taro-router/src/style.ts +++ b/packages/taro-router/src/style.ts @@ -37,10 +37,6 @@ export function loadRouterStyle (usingWindowScroll) { height: 100%; } - .taro-tabbar__container .taro_router { - min-height: calc(100vh - 50px); - } - .taro_page { width: 100%; height: 100%; From 11abf5d13b908dfd90455d67b7b9c3759dc73b4f Mon Sep 17 00:00:00 2001 From: beezen <1184031131@qq.com> Date: Tue, 5 Sep 2023 23:37:08 +0800 Subject: [PATCH 11/26] =?UTF-8?q?chore(rn-supporter):=20ts=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=8E=A8=E6=96=AD=E5=AF=BC=E8=87=B4=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86=20(#14488)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-rn-supporter/src/terminal-reporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-rn-supporter/src/terminal-reporter.ts b/packages/taro-rn-supporter/src/terminal-reporter.ts index 691ff1d8d973..ade96dbf70b6 100644 --- a/packages/taro-rn-supporter/src/terminal-reporter.ts +++ b/packages/taro-rn-supporter/src/terminal-reporter.ts @@ -21,7 +21,7 @@ export class TerminalReporter { this._sourceRoot = sourceRoot this.qr = qr ?? false this.entry = entry || 'app' - const argvs = yargs(process.argv).argv + const argvs = yargs(process.argv).argv as any if(this.qr && argvs._.includes('bundle')) { process.on('beforeExit', () => { previewProd({ From 0f80b4bb16b05661e26e04ad7de817046d20877d Mon Sep 17 00:00:00 2001 From: luckyadam Date: Wed, 6 Sep 2023 10:26:48 +0800 Subject: [PATCH 12/26] docs: update Readme --- README.md | 81 ++++++---------------------------------------------- README_EN.md | 78 +++++--------------------------------------------- 2 files changed, 16 insertions(+), 143 deletions(-) diff --git a/README.md b/README.md index 837758b28bb7..bc1be69990be 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,11 @@ GitHub Release Date +

+ 简体中文 | English +

-[简体中文](./README.md) | [English](./README_EN.md) - > 👽 Taro['tɑ:roʊ]，泰罗·奥特曼，宇宙警备队总教官，实力最强的奥特曼。 ## 目录 @@ -45,8 +46,8 @@ 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 ( - - {this.state.msg} - - ) - } -} -``` - -#### Vue 支持 - -在 Taro 3 中可以使用完整的 Vue 开发体验，具体请参考[基础教程——Vue](https://docs.taro.zone/docs/vue-overall) - -代码示例 - -```vue - - - -``` - -### 多端转换支持 - -Taro 方案的初心就是为了打造一个多端开发的解决方案。 - -目前 Taro 3 可以支持转换到`微信/京东/百度/支付宝/字节跳动/ QQ 小程序/H5/React Native` 等端。 - ## 加入共建 #### 加入 Taro 社区共建倡议 diff --git a/README_EN.md b/README_EN.md index 069c3df54333..c20c7d19ea46 100644 --- a/README_EN.md +++ b/README_EN.md @@ -34,10 +34,11 @@ GitHub Release Date +

+ 简体中文 | English +

-[简体中文](./README.md) | [English](./README_EN.md) - > 👽 Taro['tɑ:roʊ], Ultraman Taro, the chief instructor of the Space Guard, the strongest Ultraman. ## Contents @@ -45,8 +46,8 @@ 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 ( - - {this.state.msg} - - ) - } -} -``` - -#### 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 - - - -``` - -### 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 From 8896668579574cc15e305ccad9142fe9f1220696 Mon Sep 17 00:00:00 2001 From: xuanzebin <38971117+xuanzebin@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:44:29 +0800 Subject: [PATCH 13/26] =?UTF-8?q?feat(typings):=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=20(#14477)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 兼容微信小程序隐私协议 * chore(release): publish 3.6.16-alpha.0 --tag=alpha * feat(type): 添加类型引用 * chore(release): publish 3.6.16-alpha.1 --tag=alpha * feat: 调整 wx 成 weapp * fix(types): 更新隐私文档地址 * feat(h5): add privacy api tips * test: update snapshot * fix(types): lint * feat: 添加 open-type 类型耦合声明 --------- Co-authored-by: xuanzebin Co-authored-by: ZakaryCode --- package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/babel-preset-taro/package.json | 2 +- packages/create-app/package.json | 2 +- packages/css-to-react-native/package.json | 2 +- packages/eslint-config-taro/package.json | 2 +- packages/postcss-html-transform/package.json | 2 +- .../postcss-plugin-constparse/package.json | 2 +- packages/postcss-pxtransform/package.json | 2 +- packages/shared/package.json | 2 +- packages/shared/src/components.ts | 1 + .../stylelint-config-taro-rn/package.json | 2 +- packages/stylelint-taro-rn/package.json | 2 +- packages/taro-alipay/package.json | 2 +- packages/taro-api/package.json | 2 +- packages/taro-cli-convertor/package.json | 2 +- packages/taro-cli/package.json | 2 +- .../taro-components-advanced/package.json | 2 +- .../package.json | 2 +- .../taro-components-library-vue2/package.json | 2 +- .../taro-components-library-vue3/package.json | 2 +- packages/taro-components-react/package.json | 2 +- packages/taro-components-rn/package.json | 2 +- packages/taro-components/package.json | 2 +- packages/taro-components/types/Button.d.ts | 15 +++ packages/taro-extend/package.json | 2 +- packages/taro-h5/package.json | 2 +- packages/taro-h5/src/api/open-api/index.ts | 1 + packages/taro-h5/src/api/open-api/privacy.ts | 7 ++ packages/taro-helper/package.json | 2 +- packages/taro-jd/package.json | 2 +- packages/taro-loader/package.json | 2 +- packages/taro-mini-runner/package.json | 2 +- .../__tests__/__snapshots__/swan.spec.ts.snap | 16 +-- .../__snapshots__/wx-hybrid.spec.ts.snap | 2 +- packages/taro-platform-h5/package.json | 2 +- packages/taro-plugin-html/package.json | 2 +- packages/taro-plugin-http/package.json | 2 +- packages/taro-plugin-inject/package.json | 2 +- packages/taro-plugin-mini-ci/package.json | 2 +- .../taro-plugin-react-devtools/package.json | 2 +- packages/taro-plugin-react/package.json | 2 +- .../taro-plugin-vue-devtools/package.json | 2 +- packages/taro-plugin-vue2/package.json | 2 +- packages/taro-plugin-vue3/package.json | 2 +- packages/taro-qq/package.json | 2 +- packages/taro-react/package.json | 2 +- packages/taro-rn-runner/package.json | 2 +- .../taro-rn-style-transformer/package.json | 2 +- packages/taro-rn-supporter/package.json | 2 +- packages/taro-rn-transformer/package.json | 2 +- packages/taro-rn/package.json | 2 +- packages/taro-router-rn/package.json | 2 +- packages/taro-router/package.json | 2 +- packages/taro-runner-utils/package.json | 2 +- packages/taro-runtime-rn/package.json | 2 +- packages/taro-runtime/package.json | 2 +- packages/taro-service/package.json | 2 +- packages/taro-swan/package.json | 2 +- packages/taro-tt/package.json | 2 +- packages/taro-weapp/package.json | 2 +- packages/taro-webpack-runner/package.json | 2 +- packages/taro-webpack5-prebundle/package.json | 2 +- packages/taro-webpack5-runner/package.json | 2 +- .../__snapshots__/wx-hybrid.spec.ts.snap | 2 +- packages/taro-with-weapp/package.json | 2 +- packages/taro/package.json | 2 +- .../taro/types/api/open-api/device-voip.d.ts | 4 +- packages/taro/types/api/open-api/privacy.d.ts | 99 +++++++++++++++++++ packages/taro/types/taro.api.d.ts | 1 + packages/taro/types/taro.config.d.ts | 6 ++ packages/taroize/package.json | 2 +- 73 files changed, 204 insertions(+), 74 deletions(-) create mode 100644 packages/taro-h5/src/api/open-api/privacy.ts create mode 100644 packages/taro/types/api/open-api/privacy.d.ts diff --git a/package.json b/package.json index f987c5619c92..28eaada95881 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taro", - "version": "3.6.15", + "version": "3.6.16-alpha.1", "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 index b02f01b8ff15..f47e1f2cda2e 100644 --- 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-alpha.1", "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 index bf075cac5e0b..480485e02e8b 100644 --- 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-alpha.1", "main": "dist/index.js", "scripts": { "build": "tsc", diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json index e69571df2e84..7c85b1da5060 100644 --- 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-alpha.1", "description": "Taro babel preset", "author": "yuche ", "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 index b7891f68e48b..29327437a3bf 100644 --- 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-alpha.1", "description": "create taro app with one command", "author": "VincentW ", "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 index 76fe5a6bbad8..c3b1281d2d1b 100644 --- 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-alpha.1", "main": "dist/index.js", "license": "MIT", "files": [ diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json index 3a12a2292330..2358386ab928 100644 --- 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-alpha.1", "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 index d4e826eb5d6d..63f6a546a009 100644 --- 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-alpha.1", "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 index dc212ce1a137..a96efa26b40b 100644 --- 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-alpha.1", "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 index ae510f98d8a0..ad86490f69e9 100644 --- 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-alpha.1", "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位", "main": "index.js", "keywords": [ diff --git a/packages/shared/package.json b/packages/shared/package.json index 8eee98fca6cb..8848ad6e0fa1 100644 --- 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-alpha.1", "description": "Taro utils internal use.", "author": "yuche ", "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 index c3f18aafb27e..95e48e14f4dc 100644 --- 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 index bde0d2d67972..20d4ccdb4c8b 100644 --- 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-alpha.1", "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 index 3d2868f2b473..e2d6157b416f 100644 --- 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-alpha.1", "main": "dist/index.js", "files": [ "dist", diff --git a/packages/taro-alipay/package.json b/packages/taro-alipay/package.json index 8beb16303217..3991582f670a 100644 --- a/packages/taro-alipay/package.json +++ b/packages/taro-alipay/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/plugin-platform-alipay", - "version": "3.6.15", + "version": "3.6.16-alpha.1", "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 index 42865fd9ade7..0676cc8a4da2 100644 --- a/packages/taro-api/package.json +++ b/packages/taro-api/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/api", - "version": "3.6.15", + "version": "3.6.16-alpha.1", "description": "Taro common API", "author": "yuche ", "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 index fe2cb7100cfc..6aedd8ec3bc0 100644 --- 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.15", + "version": "3.6.16-alpha.1", "description": "cli tool for taro-convert", "main": "index.js", "scripts": { diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json index 13a7a8dfbe27..9eb0649d6031 100644 --- a/packages/taro-cli/package.json +++ b/packages/taro-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/cli", - "version": "3.6.15", + "version": "3.6.16-alpha.1", "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 index 936c34cafd5d..bb9d7597befd 100644 --- 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.15", + "version": "3.6.16-alpha.1", "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 index a77b048e4ed2..90841c15172b 100644 --- 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.15", + "version": "3.6.16-alpha.1", "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 index 5aa8bc163591..771294df4e2a 100644 --- 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.15", + "version": "3.6.16-alpha.1", "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 index 338b40d7588f..e8fbd54fa1b0 100644 --- 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.15", + "version": "3.6.16-alpha.1", "description": "Taro 组件库 Vue3 版本库", "private": true, "main": "index.js", diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index cf6791f4c909..c335fdabafa0 100644 --- 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.15", + "version": "3.6.16-alpha.1", "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 index 6f0b69970463..5e4ac585fd25 100644 --- 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.15", + "version": "3.6.16-alpha.1", "description": "多端解决方案基础组件（RN）", "main": "./dist/index.js", "scripts": { diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 03d7802dfc2e..c5b3bce2c725 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -1,6 +1,6 @@ { "name": "@tarojs/components", - "version": "3.6.15", + "version": "3.6.16-alpha.1", "description": "Taro 组件库", "browser": "dist/index.js", "main:h5": "dist/index.js", diff --git a/packages/taro-components/types/Button.d.ts b/packages/taro-components/types/Button.d.ts index 1a05b830b7fc..6d5d41b01bed 100644 --- a/packages/taro-components/types/Button.d.ts +++ b/packages/taro-components/types/Button.d.ts @@ -338,6 +338,21 @@ declare namespace ButtonProps { * 用户同意隐私协议按钮。可通过 bindagreeprivacyauthorization 监听用户同意隐私协议事件 */ agreePrivacyAuthorization + /** + * 从基础库 2.32.3 版本起，隐私同意按钮支持与手机号快速验证组件耦合使用，调用方式为： + *