NervJS · tutuxxx · Dec 2, 2024 · Nov 6, 2024 · Nov 6, 2024 · Nov 6, 2024
diff --git a/crates/native_binding/binding.d.ts b/crates/native_binding/binding.d.ts
@@ -23,6 +23,7 @@ export interface CreateOptions {
   version?: string
   date?: string
   typescript?: boolean
+  buildEs5?: boolean
   template: string
   pageName?: string
   compiler?: CompilerType
@@ -105,6 +106,7 @@ export interface Project {
   npm: NpmType
   description?: string
   typescript?: boolean
+  buildEs5?: boolean
   template: string
   css: CSSType
   autoInstall?: boolean

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

diff --git a/crates/native_binding/src/lib.rs b/crates/native_binding/src/lib.rs
@@ -18,6 +18,7 @@ pub async fn create_project(
     conf.npm,
     conf.description,
     conf.typescript,
+    conf.build_es5,
     conf.template,
     conf.css,
     conf.framework,

diff --git a/crates/swc_plugin_compile_mode/src/tests/attributes.rs b/crates/swc_plugin_compile_mode/src/tests/attributes.rs
@@ -47,6 +47,7 @@ test!(
             <View onClick={handleViewClick}></View>
             <View onAnimationStart={() => {}} id={myId}></View>
             <Image onLoad={() => {}} id="myImg" />
+            <View nativeView="view" onScroll={() => {}} onScrollUpdateWorklet="onScrollUpdate" onGestureWorklet="onGesture" shouldResponseOnMoveWorklet="shouldResponseOnMoveCallBack"></View>
           </View>
         )
       }

diff --git a/crates/swc_plugin_compile_mode/src/transform.rs b/crates/swc_plugin_compile_mode/src/transform.rs
@@ -342,6 +342,15 @@ impl TransformVisitor {
             Some(jsx_attr_value) => {
               match jsx_attr_value {
                 JSXAttrValue::Lit(Lit::Str(Str { value, .. })) => {
+                  // 处理worklet事件
+                  if is_event {
+                    let event_name_str = event_name.unwrap();
+                    if event_name_str.starts_with("worklet:") {
+                      props.insert(event_name_str, value.to_string());
+                      return false;
+                    }
+                  }
+
                   // 静态属性在 xml 中保留即可，jsx 中可以删除
                   if jsx_attr_name != COMPILE_MODE {
                     props.insert(miniapp_attr_name, value.to_string());

diff --git a/crates/swc_plugin_compile_mode/src/utils/mod.rs b/crates/swc_plugin_compile_mode/src/utils/mod.rs
@@ -88,6 +88,19 @@ pub fn check_is_event_attr(val: &str) -> bool {
 }
 
 pub fn identify_jsx_event_key(val: &str, platform: &str) -> Option<String> {
+
+  // 处理worklet事件及callback
+  // 事件：     onScrollUpdateWorklet         ->  worklet:onscrollupdate
+  // callback：shouldResponseOnMoveWorklet   ->  worklet:should-response-on-move
+  if val.ends_with("Worklet") {
+    let worklet_name = val.trim_end_matches("Worklet");
+    if worklet_name.starts_with("on") {
+      return Some(format!("worklet:{}", worklet_name.to_lowercase()));
+    } else {
+      return Some(format!("worklet:{}", to_kebab_case(worklet_name)));
+    }
+  }
+
   if check_is_event_attr(val) {
     let event_name = val.get(2..).unwrap().to_lowercase();
     let event_name = if event_name == "click" {

diff --git a/...ugin_compile_mode/tests/__swc_snapshots__/src/tests/attributes.rs/should_handle_events.js b/...ugin_compile_mode/tests/__swc_snapshots__/src/tests/attributes.rs/should_handle_events.js
@@ -1,8 +1,14 @@
-const TARO_TEMPLATES_f0t0 = '<template name="tmpl_0_f0t0"><view><view bindtap="eh" data-sid="{{i.cn[0].sid}}" id="{{i.cn[0].sid}}"></view><view bindanimationstart="eh" data-sid="{{i.cn[1].sid}}" id="{{i.cn[1].uid}}"></view><image bindload="eh" data-sid="{{i.cn[2].sid}}" id="myImg"></image></view></template>';
+const TARO_TEMPLATES_f0t0 = '<template name="tmpl_0_f0t0"><view><view bindtap="eh" data-sid="{{i.cn[0].sid}}" id="{{i.cn[0].sid}}"></view><view bindanimationstart="eh" data-sid="{{i.cn[1].sid}}" id="{{i.cn[1].uid}}"></view><image bindload="eh" data-sid="{{i.cn[2].sid}}" id="myImg"></image><view bindscroll="eh" data-sid="{{i.cn[3].sid}}" id="{{i.cn[3].sid}}" native-view="view" worklet:ongesture="onGesture" worklet:onscrollupdate="onScrollUpdate" worklet:should-response-on-move="shouldResponseOnMoveCallBack"></view></view></template>';
 function Index() {
     return <View compileMode="f0t0">
+
             <View onClick={handleViewClick}></View>
-            <View onAnimationStart={() => {}} id={myId}></View>
-            <Image onLoad={() => {}} />
-          </View>
+
+            <View onAnimationStart={()=>{}} id={myId}></View>
+
+            <Image onLoad={()=>{}}/>
+
+            <View onScroll={()=>{}}></View>
+
+          </View>;
 }
diff --git a/crates/taro_init/src/creator.rs b/crates/taro_init/src/creator.rs
@@ -30,6 +30,7 @@ pub struct CreateOptions {
   pub version: Option<String>,
   pub date: Option<String>,
   pub typescript: Option<bool>,
+  pub build_es5: Option<bool>,
   pub template: String,
   pub page_name: Option<String>,
   pub compiler: Option<CompilerType>,

diff --git a/crates/taro_init/src/page.rs b/crates/taro_init/src/page.rs
@@ -113,6 +113,7 @@ impl Page {
       set_page_name: None,
       set_sub_pkg_page_name: None,
       change_ext: None,
+      build_es5: None,
       is_custom_template: self.is_custom_template.clone(),
       plugin_type: None,
     };

diff --git a/crates/taro_init/src/plugin.rs b/crates/taro_init/src/plugin.rs
@@ -56,6 +56,7 @@ impl Plugin {
       version: Some(self.version.clone()),
       date: None,
       typescript: None,
+      build_es5: None,
       template: self.template.clone(),
       page_name: None,
       compiler: None,

diff --git a/crates/taro_init/src/project.rs b/crates/taro_init/src/project.rs
@@ -19,6 +19,7 @@ pub struct Project {
   pub npm: NpmType,
   pub description: Option<String>,
   pub typescript: Option<bool>,
+  pub build_es5: Option<bool>,
   pub template: String,
   pub css: CSSType,
   pub auto_install: Option<bool>,
@@ -37,6 +38,7 @@ impl Project {
     npm: NpmType,
     description: Option<String>,
     typescript: Option<bool>,
+    build_es5: Option<bool>,
     template: String,
     css: CSSType,
     framework: FrameworkType,
@@ -53,6 +55,7 @@ impl Project {
       npm,
       description,
       typescript,
+      build_es5,
       template,
       css,
       auto_install,
@@ -103,6 +106,7 @@ impl Project {
       version: Some(self.version.clone()),
       date: self.date.clone(),
       typescript: self.typescript.clone(),
+      build_es5: self.build_es5.clone(),
       template: self.template.clone(),
       page_name: Some("index".to_string()),
       compiler: self.compiler.clone(),

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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "4.0.8-beta.0",
+  "version": "4.0.8-beta.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
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "4.0.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "description": "Taro utils internal use.",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts
@@ -525,10 +525,10 @@ export const voidElements = new Set([
 export const nestElements = new Map([
   ['view', -1],
   ['catch-view', -1],
-  ['click-view', -1],
   ['cover-view', -1],
   ['static-view', -1],
   ['pure-view', -1],
+  ['click-view', -1],
   ['block', -1],
   ['text', -1],
   ['static-text', 6],

diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
@@ -217,10 +217,11 @@ export class BaseTemplate {
               style: comp.style,
               class: comp.class
             }
+
             result['click-view'] = {
               style: comp.style,
               class: comp.class,
-              bindtap: 'eh'
+              ...this.getClickEvent()
             }
           }
         }
@@ -412,9 +413,9 @@ export class BaseTemplate {
       case 'slot':
       case 'slot-view':
       case 'catch-view':
-      case 'click-view':
       case 'static-view':
       case 'pure-view':
+      case 'click-view':
         nodeName = 'view'
         break
       case 'static-text':
@@ -515,6 +516,10 @@ export class BaseTemplate {
     return events
   }
 
+  protected getClickEvent (): any {
+    return { bindtap: 'eh' }
+  }
+
   protected getAttrValue (value: string, _key: string, _nodeName: string) {
     return `{${value}}`
   }

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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "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.8-beta.0",
+  "version": "4.0.8-beta.1",
   "description": "Taro common API",
   "author": "O2Team",
   "license": "MIT",