feat(sync): merge harmony (#16161)

* fix: 支持关闭 jsx 样式注入，并提供 css map * chore(release): publish 4.0.0-alpha.24 --tag=alpha * fix(vite): 修复组件模式配置缺失问题 * chore(release): publish 4.0.0-alpha.25 --tag=alpha * feat: update from ets runtime * chore(release): publish 4.0.0-alpha.26 --tag=alpha * feat(harmony): add terser plugin * chore(release): publish 4.0.0-alpha.27 --tag=alpha * fix: 移除废弃插件 * feat(ets): 调整运行时导出 * feat: 更新 capi 版本 runtime * feat(harmony): add cpp style * fix: 修复导出路径 * chore(release): publish 4.0.0-alpha.36 --tag=alpha * fix(harmony): update runtime * fix: 修复cssmodules匹配不到的问题 * feat: comp.js 支持路由重命名 * feat: 去掉console * fix: uid types * fix(harmony): 修复常量替换问题 * fix(harmony): 调整 api 依赖引用 * chore(release): publish 4.0.0-alpha.44 --tag=alpha * fix(harmony): 移除 onpm 不能装载的类型 * fix: 修复 input 事件错误逻辑 * fix: 修复 form 元素移除属性错误 * fix(react): env shake * fix: 修复stickySection没有渲染list-item的问题 * chore(release): publish 4.0.0-beta.119 --tag=beta * fix: 修复list-view问题 * chore(release): publish 4.0.0-beta.120 --tag=beta * fix: 修复sticky-section没有被复用 * chore(release): publish 4.0.0-beta.121 --tag=beta * fix: 修复错误引入taro的问题 * chore(release): publish 4.0.0-beta.122 --tag=beta * chore(release): publish 4.0.0-beta.122 --tag=beta * fix: 修复cssmodule样式不生效 * chore(release): publish 4.0.0-beta.123 --tag=beta * fix: 临时修复 harmony 不能编译 ts 的问题 * chore(release): publish 4.0.0-beta.124 --tag=beta * fix: 兼容找不到页面情况 * fix(harmony): 优化 contextPromise 设置 * fix(harmony): 修复读取配置时缺少常量注入 * chore(release): publish 4.0.0-beta.125 --tag=beta * fix: code * feat(harmony): 修复图片等资源注入引用问题 * chore(release): publish 4.0.0-beta.126 --tag=beta * fix: 修复 readConfig 时引入 babel 导致的问题 * fix: 更新 lint 问题 * chore(release): publish 4.0.0-beta.127 --tag=beta * fix: 修复 readConfig 时引入 babel 导致问题 * chore(release): publish 4.0.0-beta.128 --tag=beta * fix: 修复scroll无法禁止滚动的bug * chore(release): publish 4.0.0-beta.129 --tag=beta * feat: 在style的opacity设置成空字符串里把他设置成1，避免harmony beta2把opacity的默认值设置成0的情况 * fix: 解决合并冲突 * feat: 替换 PLATFORM_TYPE 常量 * chore(release): publish 4.0.3-alpha.5 --tag=alpha * fix: 修复鸿蒙端的pagaName获取不到的问题和ets的类型问题 --------- Co-authored-by: ZakaryCode <[email protected]> Co-authored-by: mayintao3 <[email protected]> Co-authored-by: zhuminghui2 <[email protected]> Co-authored-by: xuanzebin <[email protected]> Co-authored-by: liuzejia <[email protected]>
NervJS · Jul 25, 2024 · 1731295 · 1731295
1 parent 600af0f
commit 1731295
Show file tree

Hide file tree

Showing 170 changed files with 583 additions and 574 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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "4.0.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/babel-preset-taro/index.js b/packages/babel-preset-taro/index.js
@@ -35,8 +35,10 @@ module.exports = (_, options = {}) => {
   const isSolid = options.framework === 'solid' && !isVite
   // vite 不需要 vue 的 preset，在内部已经处理了
   const isVue3 = options.framework === 'vue3' && !isVite
+  // TODO：后续改为在 vite harmony 中实现对 ts 的支持
+  const isHarmony = process.env.TARO_PLATFORM === 'harmony'
   // vite 不需要使用 babel 处理 ts，在 esbuild 中处理了
-  const isTs = options.ts && !isVite
+  const isTs = options.ts && (!isVite || isHarmony)
   const moduleName = options.framework.charAt(0).toUpperCase() + options.framework.slice(1)
   const presetReactConfig = options.react || {}
 

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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "description": "React/Preact 框架插件",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "description": "Taro Helper",
   "author": "O2Team",
   "license": "MIT",

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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "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.3-alpha.4",
+  "version": "4.0.3-alpha.5",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",

diff --git a/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts b/packages/taro-platform-harmony/src/apis/base/weapp/life-cycle.ts
@@ -1,4 +1,4 @@
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { eventCenter } from '@tarojs/runtime'
 
 import type Taro from '@tarojs/taro/types'
 

diff --git a/packages/taro-platform-harmony/src/apis/framework/index.ts b/packages/taro-platform-harmony/src/apis/framework/index.ts
@@ -24,4 +24,4 @@ export { Current, getCurrentInstance } from '@tarojs/runtime'
 
 export const requirePlugin = temporarilyNotSupport('requirePlugin')
 
-export { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm'
+export { eventCenter, Events, History } from '@tarojs/runtime'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,4 @@ export { Current, getCurrentInstance } from '@tarojs/runtime'

		export const requirePlugin = temporarilyNotSupport('requirePlugin')

		export { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm'
		export { eventCenter, Events, History } from '@tarojs/runtime'