Merge branch 'feat/harmony' of github.com:NervJS/taro into feat/harmony

NervJS · Aug 7, 2024 · f3d6f64 · f3d6f64
2 parents 52f162a + f58dadf
commit f3d6f64
Show file tree

Hide file tree

Showing 79 changed files with 85 additions and 80 deletions.
diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "os": [
     "linux"
   ],

diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding-linux-x64-musl",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/babel-plugin-transform-solid-jsx/package.json b/packages/babel-plugin-transform-solid-jsx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-transform-solid-jsx",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "license": "MIT",
   "repository": {
     "type": "git",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro babel preset",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "create taro app with one command",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro specific linting rules for ESLint",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-taro-helper",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "jest helper for taro",
   "private": true,
   "author": "O2Team",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "transform html tag name selector",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "parse constants defined in config",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "小程序单位转换",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-copy",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "rollup-plugin-copy for taro",
   "private": true,
   "author": "O2Team",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro utils internal use.",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Shareable stylelint config for React Native CSS modules",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro-rn",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "A collection of React Native specific rules for stylelint",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/stylelint-taro/package.json b/packages/stylelint-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro stylelint 规则集合",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro common API",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "cli tool for taro-convert",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "cli tool for taro",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "",
   "author": "O2Team",
   "license": "MIT",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "author": "O2Team",

diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-solid",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro 组件库 Solid 版本库",
   "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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro 组件库 Vue3 版本库",
   "private": true,
   "author": "O2Team",

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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "",
   "main:h5": "dist/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": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "React Native 基础组件",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/extend",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro extend functionality",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-framework-react/package.json b/packages/taro-framework-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-framework-react",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "React/Preact/Nerv 框架插件",
   "author": "O2Team",
   "homepage": "https://github.com/nervjs/taro",

diff --git a/packages/taro-framework-solid/package.json b/packages/taro-framework-solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-framework-solid",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Solid 框架插件",
   "author": "drchan",
   "homepage": "https://github.com/nervjs/taro",

diff --git a/packages/taro-framework-vue3/package.json b/packages/taro-framework-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-framework-vue3",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Vue3 框架插件",
   "author": "O2Team",
   "homepage": "https://github.com/nervjs/taro",

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

diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro Helper",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-helper/src/utils.ts b/packages/taro-helper/src/utils.ts
@@ -644,7 +644,7 @@ export function readConfig<T extends IReadConfigOptions> (configPath: string, op
       result = requireWithEsbuild(configPath, {
         customConfig: {
           alias: options.alias || {},
-          define: defaults(options.defineConstants || {}, {
+          define: defaults({}, options.defineConstants || {}, {
             define: 'define', // Note: 该场景下不支持 AMD 导出，这会导致 esbuild 替换 babel 的 define 方法
           }),
         },

diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-loader",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Taro runner use webpack loader",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-platform-alipay/package.json b/packages/taro-platform-alipay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-alipay",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "支付宝小程序平台插件",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-h5",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Web 端平台插件",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-hybrid",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "Harmony 端平台插件",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-platform-harmony/package.json b/packages/taro-platform-harmony/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.130",
+  "version": "4.0.0-beta.132",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",

diff --git a/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets b/packages/taro-platform-harmony/src/components/components-harmony-ets/style.ets
@@ -363,7 +363,7 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style:
     })
   }
   if (!isUndefined(style.opacity)) {
-    instance.opacity(style.opacity === '' ? 1: style.opacity)
+    instance.opacity(String(style.opacity) === '' ? 1: style.opacity)
   }
   if (!isUndefined(style.overflow)) {
     instance.clip(style.overflow === 'hidden')

diff --git a/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts b/packages/taro-platform-harmony/src/runtime-ets/dom/node.ts
@@ -190,6 +190,11 @@ export class TaroNode extends TaroDataSourceElement {
     this.childNodes.push(child)
     this.notifyDataAdd(this.childNodes.length - 1)
 
+    if (this.nodeName === "TEXT") {
+      // 修复beta2版本文字从undefined -> 有值时的 不更新问题
+      this.updateComponent()
+    }
+
     // @ts-ignore
     child.toggleLayer?.(true)