chore: merge

package.json

@@ -57,7 +57,7 @@
     "@types/jest": "^26.0.23",
     "@typescript-eslint/parser": "^5.3.0",
     "@vitejs/plugin-vue": "^2.2.0",
-    "@vitejs/plugin-vue-jsx": "^1.3.5",
+    "@vitejs/plugin-vue-jsx": "^1.3.7",
     "@vue/reactivity": "3.2.30",
     "@vue/runtime-core": "3.2.30",
     "@vue/runtime-dom": "3.2.30",

packages/uni-components/dist/components.js

@@ -478,7 +478,7 @@ var Button = defineComponent({
         return;
       }
       if (isLabelClick) {
-        rootRef.value.click();
+        rootRef.value.event.click.handler(e2);
       }
     };
     const _getClass = (t2) => {
@@ -518,7 +518,7 @@ var Button = defineComponent({
       return vnodes;
     };
     return () => {
-      return createVNode("div", mergeProps({
+      return createVNode("view", mergeProps({
         "ref": rootRef,
         "class": ["ub", _getClass("")]
       }, extend({}, useHoverClass(props), {

packages/uni-components/src/nvue/button/index.tsx

@@ -211,7 +211,7 @@ export default defineComponent({
         return
       }
       if (isLabelClick) {
-        rootRef.value!.click()
+        ;(rootRef.value as any).event.click.handler(e)
       }
       /* const formType = props.formType
       if (formType) {
@@ -269,7 +269,7 @@ export default defineComponent({
 
     return () => {
       return (
-        <div
+        <view
           ref={rootRef}
           class="ub"
           // @ts-expect-error
@@ -288,7 +288,7 @@ export default defineComponent({
             ></loading-indicator>
           ) : null}
           {...wrapSlots()}
-        </div>
+        </view>
       )
     }
   },

packages/vite-plugin-uni/package.json

@@ -30,7 +30,7 @@
     "@rollup/pluginutils": "^4.1.2",
     "@vitejs/plugin-legacy": "^1.7.1",
     "@vitejs/plugin-vue": "^2.2.0",
-    "@vitejs/plugin-vue-jsx": "^1.3.5",
+    "@vitejs/plugin-vue-jsx": "^1.3.7",
     "@vue/compiler-core": "3.2.30",
     "@vue/compiler-dom": "3.2.30",
     "@vue/compiler-sfc": "3.2.30",

pnpm-lock.yaml

@@ -20,7 +20,7 @@ importers:
       '@types/jest': ^26.0.23
       '@typescript-eslint/parser': ^5.3.0
       '@vitejs/plugin-vue': ^2.2.0
-      '@vitejs/plugin-vue-jsx': ^1.3.5
+      '@vitejs/plugin-vue-jsx': ^1.3.7
       '@vue/reactivity': 3.2.30
       '@vue/runtime-core': 3.2.30
       '@vue/runtime-dom': 3.2.30
@@ -68,7 +68,7 @@ importers:
       '@types/jest': 26.0.24
       '@typescript-eslint/parser': 5.5.0_eslint@7.32.0+typescript@4.5.3
       '@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30
-      '@vitejs/plugin-vue-jsx': 1.3.5
+      '@vitejs/plugin-vue-jsx': 1.3.7
       '@vue/reactivity': 3.2.30
       '@vue/runtime-core': 3.2.30
       '@vue/runtime-dom': 3.2.30
@@ -736,7 +736,7 @@ importers:
       '@types/sass': ^1.16.0
       '@vitejs/plugin-legacy': ^1.7.1
       '@vitejs/plugin-vue': ^2.2.0
-      '@vitejs/plugin-vue-jsx': ^1.3.5
+      '@vitejs/plugin-vue-jsx': ^1.3.7
       '@vue/babel-plugin-jsx': ^1.1.1
       '@vue/compiler-core': 3.2.30
       '@vue/compiler-dom': 3.2.30
@@ -760,7 +760,7 @@ importers:
       '@rollup/pluginutils': 4.1.2
       '@vitejs/plugin-legacy': 1.7.1_vite@2.8.1
       '@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30
-      '@vitejs/plugin-vue-jsx': 1.3.5
+      '@vitejs/plugin-vue-jsx': 1.3.7
       '@vue/compiler-core': 3.2.30
       '@vue/compiler-dom': 3.2.30
       '@vue/compiler-sfc': 3.2.30
@@ -3141,8 +3141,8 @@ packages:
       vite: 2.8.1
     dev: false
 
-  /@vitejs/plugin-vue-jsx/1.3.5:
-    resolution: {integrity: sha512-iBxRQS8SOGxI4c8/cucgumD9a1SO4ngn91YbluyWe1L2k0D7+3v64XbjZxXX2O964LubY8Tehl3ihr0W7f3+/g==}
+  /@vitejs/plugin-vue-jsx/1.3.7:
+    resolution: {integrity: sha512-UH+lI/TtBQg1YZeOTBN5yEYvSDNcL2ei8ZgE+0ESX2ULg2xV7rxzw1TB1eHZiMGXOSR8h5AWp/6F1hCcaq8VYA==}
     engines: {node: '>=12.0.0'}
     dependencies:
       '@babel/core': 7.17.2

scripts/checkVersion.js

@@ -28,7 +28,7 @@ const pkgs = {
     latest: '2.2.0',
   },
   '@vitejs/plugin-vue-jsx': {
-    latest: '1.3.5',
+    latest: '1.3.7',
   },
   '@vitejs/plugin-legacy': {
     latest: '1.7.1',