chore: merge

package.json

@@ -62,11 +62,11 @@
     "@typescript-eslint/parser": "^5.59.1",
     "@vitejs/plugin-vue": "^4.2.1",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/reactivity": "3.2.47",
-    "@vue/runtime-core": "3.2.47",
-    "@vue/runtime-dom": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/reactivity": "3.3.11",
+    "@vue/runtime-core": "3.3.11",
+    "@vue/runtime-dom": "3.3.11",
+    "@vue/shared": "3.3.11",
     "core-js": "^2.6.12",
     "cypress": "^10.7.0",
     "enquirer": "^2.3.6",
@@ -91,7 +91,7 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4",
     "vite": "4.3.5",
-    "vue": "3.2.47",
+    "vue": "3.3.11",
     "vue-router": "^4.1.6",
     "yorkie": "^2.0.0"
   },

packages/playground/nvue/package.json

@@ -13,7 +13,7 @@
     "@dcloudio/uni-app": "../../uni-app",
     "@dcloudio/uni-app-plus": "../../uni-app-plus",
     "@dcloudio/uni-components": "../../uni-components",
-    "vue": "3.2.47",
+    "vue": "3.3.11",
     "vue-router": "^4.1.6",
     "vuex": "^4.1.0"
   },

packages/playground/ssr/package.json

@@ -12,7 +12,7 @@
     "@dcloudio/uni-app": "../../uni-app",
     "@dcloudio/uni-components": "../../uni-components",
     "@dcloudio/uni-h5": "../../uni-h5",
-    "vue": "3.2.47",
+    "vue": "3.3.11",
     "vue-router": "^4.1.6",
     "vuex": "^4.1.0"
   },

packages/size-check/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@dcloudio/uni-app": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-h5": "3.0.0-alpha-3090920231203001",
-    "vue": "3.2.47",
+    "vue": "3.3.11",
     "vue-i18n": "9.1.9",
     "vuex": "^4.1.0"
   },

packages/uni-api/package.json

@@ -15,7 +15,7 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   },
   "devDependencies": {
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001"

packages/uni-app-plus/dist/tools.umd.js

 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-    typeof define === 'function' && define.amd ? define(['exports'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Tools = {}));
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Tools = {}));
 })(this, (function (exports) { 'use strict';
 
-    /**
-     * Make a map and return a function for checking if a key
-     * is in that map.
-     * IMPORTANT: all calls of this function must be prefixed with
-     * \/\*#\_\_PURE\_\_\*\/
-     * So that rollup can tree-shake them if necessary.
-     */
+  !!(process.env.NODE_ENV !== "production") ? Object.freeze({}) : {};
+  !!(process.env.NODE_ENV !== "production") ? Object.freeze([]) : [];
+  const hasOwnProperty = Object.prototype.hasOwnProperty;
+  const hasOwn = (val, key) => hasOwnProperty.call(val, key);
 
-    (process.env.NODE_ENV !== 'production')
-        ? Object.freeze({})
-        : {};
-    (process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
-    const hasOwnProperty = Object.prototype.hasOwnProperty;
-    const hasOwn = (val, key) => hasOwnProperty.call(val, key);
+  const ACTION_TYPE_PAGE_CREATE = 1;
+  const ACTION_TYPE_PAGE_CREATED = 2;
+  const ACTION_TYPE_CREATE = 3;
+  const ACTION_TYPE_INSERT = 4;
+  const ACTION_TYPE_REMOVE = 5;
+  const ACTION_TYPE_SET_ATTRIBUTE = 6;
+  const ACTION_TYPE_REMOVE_ATTRIBUTE = 7;
+  const ACTION_TYPE_ADD_EVENT = 8;
+  const ACTION_TYPE_REMOVE_EVENT = 9;
+  const ACTION_TYPE_SET_TEXT = 10;
+  const ACTION_TYPE_ADD_WXS_EVENT = 12;
 
-    const ACTION_TYPE_PAGE_CREATE = 1;
-    const ACTION_TYPE_PAGE_CREATED = 2;
-    const ACTION_TYPE_CREATE = 3;
-    const ACTION_TYPE_INSERT = 4;
-    const ACTION_TYPE_REMOVE = 5;
-    const ACTION_TYPE_SET_ATTRIBUTE = 6;
-    const ACTION_TYPE_REMOVE_ATTRIBUTE = 7;
-    const ACTION_TYPE_ADD_EVENT = 8;
-    const ACTION_TYPE_REMOVE_EVENT = 9;
-    const ACTION_TYPE_SET_TEXT = 10;
-    const ACTION_TYPE_ADD_WXS_EVENT = 12;
+  const ACTION_TYPE_DICT = 0;
 
-    const ACTION_TYPE_DICT = 0;
+  function createGetDict(dict) {
+      if (!dict.length) {
+          return (v) => v;
+      }
+      const getDict = (value, includeValue = true) => {
+          if (typeof value === 'number') {
+              return dict[value];
+          }
+          const res = {};
+          value.forEach(([n, v]) => {
+              if (includeValue) {
+                  res[getDict(n)] = getDict(v);
+              }
+              else {
+                  res[getDict(n)] = v;
+              }
+          });
+          return res;
+      };
+      return getDict;
+  }
+  function decodeActions(actions) {
+      const [type, dict] = actions[0];
+      if (type !== ACTION_TYPE_DICT) {
+          return actions;
+      }
+      const getDict = createGetDict(dict);
+      return actions.map((action) => {
+          switch (action[0]) {
+              case ACTION_TYPE_DICT:
+                  return action;
+              case ACTION_TYPE_PAGE_CREATE:
+                  return decodePageCreateAction(action);
+              case ACTION_TYPE_PAGE_CREATED:
+                  return decodePageCreatedAction(action);
+              case ACTION_TYPE_CREATE:
+                  return decodeCreateAction(action, getDict);
+              case ACTION_TYPE_INSERT:
+                  return decodeInsertAction(action, getDict);
+              case ACTION_TYPE_REMOVE:
+                  return decodeRemoveAction(action);
+              case ACTION_TYPE_SET_ATTRIBUTE:
+                  return decodeSetAttributeAction(action, getDict);
+              case ACTION_TYPE_REMOVE_ATTRIBUTE:
+                  return decodeRemoveAttributeAction(action, getDict);
+              case ACTION_TYPE_ADD_EVENT:
+                  return decodeAddEventAction(action, getDict);
+              case ACTION_TYPE_ADD_WXS_EVENT:
+                  return decodeAddWxsEventAction(action, getDict);
+              case ACTION_TYPE_REMOVE_EVENT:
+                  return decodeRemoveEventAction(action, getDict);
+              case ACTION_TYPE_SET_TEXT:
+                  return decodeSetTextAction(action, getDict);
+          }
+      });
+  }
+  function decodePageCreateAction([, pageCreateData]) {
+      return ['pageCreate', pageCreateData];
+  }
+  function decodePageCreatedAction([]) {
+      return ['pageCreated'];
+  }
+  function decodeNodeJson(getDict, nodeJson) {
+      if (!nodeJson) {
+          return;
+      }
+      if (hasOwn(nodeJson, 'a')) {
+          nodeJson.a = getDict(nodeJson.a);
+      }
+      if (hasOwn(nodeJson, 'e')) {
+          nodeJson.e = getDict(nodeJson.e, false);
+      }
+      if (hasOwn(nodeJson, 'w')) {
+          nodeJson.w = getWxsEventDict(nodeJson.w, getDict);
+      }
+      if (hasOwn(nodeJson, 's')) {
+          nodeJson.s = getDict(nodeJson.s);
+      }
+      if (hasOwn(nodeJson, 't')) {
+          nodeJson.t = getDict(nodeJson.t);
+      }
+      return nodeJson;
+  }
+  function getWxsEventDict(w, getDict) {
+      const res = {};
+      w.forEach(([name, [wxsEvent, flag]]) => {
+          res[getDict(name)] = [getDict(wxsEvent), flag];
+      });
+      return res;
+  }
+  function decodeCreateAction([, nodeId, nodeName, parentNodeId, refNodeId, nodeJson], getDict) {
+      return [
+          'create',
+          nodeId,
+          getDict(nodeName),
+          parentNodeId,
+          refNodeId,
+          decodeNodeJson(getDict, nodeJson),
+      ];
+  }
+  function decodeInsertAction([, ...action], getDict) {
+      return [
+          'insert',
+          action[0],
+          action[1],
+          action[2],
+          action[3] ? decodeNodeJson(getDict, action[3]) : {},
+      ];
+  }
+  function decodeRemoveAction([, ...action]) {
+      return ['remove', ...action];
+  }
+  function decodeAddEventAction([, ...action], getDict) {
+      return ['addEvent', action[0], getDict(action[1]), action[2]];
+  }
+  function decodeAddWxsEventAction([, ...action], getDict) {
+      return [
+          'addWxsEvent',
+          action[0],
+          getDict(action[1]),
+          getDict(action[2]),
+          action[3],
+      ];
+  }
+  function decodeRemoveEventAction([, ...action], getDict) {
+      return ['removeEvent', action[0], getDict(action[1])];
+  }
+  function decodeSetAttributeAction([, ...action], getDict) {
+      return [
+          'setAttr',
+          action[0],
+          getDict(action[1]),
+          getDict(action[2]),
+      ];
+  }
+  function decodeRemoveAttributeAction([, ...action], getDict) {
+      return ['removeAttr', action[0], getDict(action[1])];
+  }
+  function decodeSetTextAction([, ...action], getDict) {
+      return ['setText', action[0], getDict(action[1])];
+  }
 
-    function createGetDict(dict) {
-        if (!dict.length) {
-            return (v) => v;
-        }
-        const getDict = (value, includeValue = true) => {
-            if (typeof value === 'number') {
-                return dict[value];
-            }
-            const res = {};
-            value.forEach(([n, v]) => {
-                if (includeValue) {
-                    res[getDict(n)] = getDict(v);
-                }
-                else {
-                    res[getDict(n)] = v;
-                }
-            });
-            return res;
-        };
-        return getDict;
-    }
-    function decodeActions(actions) {
-        const [type, dict] = actions[0];
-        if (type !== ACTION_TYPE_DICT) {
-            return actions;
-        }
-        const getDict = createGetDict(dict);
-        return actions.map((action) => {
-            switch (action[0]) {
-                case ACTION_TYPE_DICT:
-                    return action;
-                case ACTION_TYPE_PAGE_CREATE:
-                    return decodePageCreateAction(action);
-                case ACTION_TYPE_PAGE_CREATED:
-                    return decodePageCreatedAction(action);
-                case ACTION_TYPE_CREATE:
-                    return decodeCreateAction(action, getDict);
-                case ACTION_TYPE_INSERT:
-                    return decodeInsertAction(action, getDict);
-                case ACTION_TYPE_REMOVE:
-                    return decodeRemoveAction(action);
-                case ACTION_TYPE_SET_ATTRIBUTE:
-                    return decodeSetAttributeAction(action, getDict);
-                case ACTION_TYPE_REMOVE_ATTRIBUTE:
-                    return decodeRemoveAttributeAction(action, getDict);
-                case ACTION_TYPE_ADD_EVENT:
-                    return decodeAddEventAction(action, getDict);
-                case ACTION_TYPE_ADD_WXS_EVENT:
-                    return decodeAddWxsEventAction(action, getDict);
-                case ACTION_TYPE_REMOVE_EVENT:
-                    return decodeRemoveEventAction(action, getDict);
-                case ACTION_TYPE_SET_TEXT:
-                    return decodeSetTextAction(action, getDict);
-            }
-        });
-    }
-    function decodePageCreateAction([, pageCreateData]) {
-        return ['pageCreate', pageCreateData];
-    }
-    function decodePageCreatedAction([]) {
-        return ['pageCreated'];
-    }
-    function decodeNodeJson(getDict, nodeJson) {
-        if (!nodeJson) {
-            return;
-        }
-        if (hasOwn(nodeJson, 'a')) {
-            nodeJson.a = getDict(nodeJson.a);
-        }
-        if (hasOwn(nodeJson, 'e')) {
-            nodeJson.e = getDict(nodeJson.e, false);
-        }
-        if (hasOwn(nodeJson, 'w')) {
-            nodeJson.w = getWxsEventDict(nodeJson.w, getDict);
-        }
-        if (hasOwn(nodeJson, 's')) {
-            nodeJson.s = getDict(nodeJson.s);
-        }
-        if (hasOwn(nodeJson, 't')) {
-            nodeJson.t = getDict(nodeJson.t);
-        }
-        return nodeJson;
-    }
-    function getWxsEventDict(w, getDict) {
-        const res = {};
-        w.forEach(([name, [wxsEvent, flag]]) => {
-            res[getDict(name)] = [getDict(wxsEvent), flag];
-        });
-        return res;
-    }
-    function decodeCreateAction([, nodeId, nodeName, parentNodeId, refNodeId, nodeJson], getDict) {
-        return [
-            'create',
-            nodeId,
-            getDict(nodeName),
-            parentNodeId,
-            refNodeId,
-            decodeNodeJson(getDict, nodeJson),
-        ];
-    }
-    function decodeInsertAction([, ...action], getDict) {
-        return [
-            'insert',
-            action[0],
-            action[1],
-            action[2],
-            action[3] ? decodeNodeJson(getDict, action[3]) : {},
-        ];
-    }
-    function decodeRemoveAction([, ...action]) {
-        return ['remove', ...action];
-    }
-    function decodeAddEventAction([, ...action], getDict) {
-        return ['addEvent', action[0], getDict(action[1]), action[2]];
-    }
-    function decodeAddWxsEventAction([, ...action], getDict) {
-        return [
-            'addWxsEvent',
-            action[0],
-            getDict(action[1]),
-            getDict(action[2]),
-            action[3],
-        ];
-    }
-    function decodeRemoveEventAction([, ...action], getDict) {
-        return ['removeEvent', action[0], getDict(action[1])];
-    }
-    function decodeSetAttributeAction([, ...action], getDict) {
-        return [
-            'setAttr',
-            action[0],
-            getDict(action[1]),
-            getDict(action[2]),
-        ];
-    }
-    function decodeRemoveAttributeAction([, ...action], getDict) {
-        return ['removeAttr', action[0], getDict(action[1])];
-    }
-    function decodeSetTextAction([, ...action], getDict) {
-        return ['setText', action[0], getDict(action[1])];
-    }
-
-    exports.createGetDict = createGetDict;
-    exports.decodeActions = decodeActions;
-    exports.decodeNodeJson = decodeNodeJson;
+  exports.createGetDict = createGetDict;
+  exports.decodeActions = decodeActions;
+  exports.decodeNodeJson = decodeNodeJson;
 
 }));

packages/uni-app-plus/package.json

@@ -44,10 +44,10 @@
     "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
     "@types/pako": "1.0.2",
-    "@vue/compiler-sfc": "3.2.47",
+    "@vue/compiler-sfc": "3.3.11",
     "autoprefixer": "^10.4.14",
     "pako": "^1.0.11",
     "postcss": "^8.4.21",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   }
 }

packages/uni-app-uts/__tests__/android/transforms/transformElement.spec.ts

@@ -1111,7 +1111,7 @@ describe('compiler: element transform', () => {
         }
       )
       expect(node2.patchFlag).toBe(
-        genFlagText([PatchFlags.PROPS, PatchFlags.HYDRATE_EVENTS])
+        genFlagText([PatchFlags.PROPS, PatchFlags.NEED_HYDRATION])
       )
     })
 
@@ -1126,7 +1126,7 @@ describe('compiler: element transform', () => {
         }
       )
       expect(node.patchFlag).toBe(
-        genFlagText([PatchFlags.PROPS, PatchFlags.HYDRATE_EVENTS])
+        genFlagText([PatchFlags.PROPS, PatchFlags.NEED_HYDRATION])
       )
     })
   })

packages/uni-app-uts/__tests__/android/transforms/vBind.spec.ts

@@ -76,19 +76,19 @@ describe('compiler: v-bind', () => {
   test('.prop modifier', () => {
     assert(
       `<view v-bind:className.prop="className"/>`,
-      `createElementVNode("view", utsMapOf({ ".className": _ctx.className }), null, 8 /* PROPS */, [".className"])`
+      `createElementVNode("view", utsMapOf({ ".className": _ctx.className }), null, 40 /* PROPS, NEED_HYDRATION */, [".className"])`
     )
   })
   test('.prop modifier w/ dynamic arg', () => {
     assert(
       `<view v-bind:[fooBar].prop="className"/>`,
-      'createElementVNode("view", normalizeProps(utsMapOf({ [`.${_ctx.fooBar !== null ? _ctx.fooBar : ""}`]: _ctx.className })), null, 16 /* FULL_PROPS */)'
+      'createElementVNode("view", normalizeProps(utsMapOf({ [`.${_ctx.fooBar !== null ? _ctx.fooBar : ""}`]: _ctx.className })), null, 48 /* FULL_PROPS, NEED_HYDRATION */)'
     )
   })
   test('.prop modifier (shorthand)', () => {
     assert(
       `<view .className="className"/>`,
-      'createElementVNode("view", utsMapOf({ ".className": _ctx.className }), null, 8 /* PROPS */, [".className"])'
+      'createElementVNode("view", utsMapOf({ ".className": _ctx.className }), null, 40 /* PROPS, NEED_HYDRATION */, [".className"])'
     )
   })
   test('.attr modifier', () => {

packages/uni-app-uts/__tests__/android/transforms/vModel.spec.ts

@@ -51,7 +51,7 @@ describe('compiler: transform v-model', () => {
   modelValue: _ctx.model,
   onInput: ($event: InputEvent): any => {_ctx.model = $event.detail.value;
 return $event.detail.value;}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, ["modelValue", "onInput"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, ["modelValue", "onInput"])`
     )
   })
 
@@ -68,7 +68,7 @@ _ctx.model.
 foo
  = $event.detail.value;
 return $event.detail.value;}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, ["modelValue", "onInput"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, ["modelValue", "onInput"])`
     )
   })
 
@@ -79,7 +79,7 @@ return $event.detail.value;}
   modelValue: _ctx.model[_ctx.index],
   onInput: ($event: InputEvent): any => {_ctx.model[_ctx.index] = $event.detail.value;
 return $event.detail.value;}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, [\"modelValue\", \"onInput\"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, [\"modelValue\", \"onInput\"])`
     )
   })
 
@@ -109,7 +109,7 @@ return $event.detail.value;}
   modelValue: _ctx.model,
   onBlur: ($event: InputBlurEvent): any => {_ctx.model = $event.detail.value;
 return $event.detail.value;}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, [\"modelValue\", \"onBlur\"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, [\"modelValue\", \"onBlur\"])`
     )
   })
   test('with modifier number', () => {
@@ -119,7 +119,7 @@ return $event.detail.value;}
   modelValue: _ctx.model,
   onInput: ($event: InputEvent): any => {_ctx.model = _looseToNumber($event.detail.value);
 return _looseToNumber($event.detail.value);}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, [\"modelValue\", \"onInput\"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, [\"modelValue\", \"onInput\"])`
     )
   })
   test('with modifier trim', () => {
@@ -129,7 +129,7 @@ return _looseToNumber($event.detail.value);}
   modelValue: _ctx.model,
   onInput: ($event: InputEvent): any => {_ctx.model = $event.detail.value.trim();
 return $event.detail.value.trim();}
-}), null, 40 /* PROPS, HYDRATE_EVENTS */, [\"modelValue\", \"onInput\"])`
+}), null, 40 /* PROPS, NEED_HYDRATION */, [\"modelValue\", \"onInput\"])`
     )
   })
   test('expression width type', () => {

packages/uni-app-uts/package.json

@@ -18,7 +18,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/parser": "^7.16.4",
+    "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
@@ -27,9 +27,9 @@
     "@jridgewell/gen-mapping": "^0.3.3",
     "@jridgewell/trace-mapping": "^0.3.19",
     "@rollup/pluginutils": "^4.2.0",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/shared": "3.3.11",
     "debug": "^4.3.3",
     "es-module-lexer": "^1.2.1",
     "estree-walker": "^2.0.2",

packages/uni-app-uts/src/plugins/android/uvue/compiler/transform.ts

@@ -19,7 +19,7 @@ import {
   helperNameMap,
   isSlotOutlet,
   isVSlot,
-  makeBlock,
+  convertToBlock,
   createVNodeCall,
 } from '@vue/compiler-core'
 import {
@@ -309,7 +309,7 @@ function createRootCodegen(root: RootNode, context: TransformContext) {
       // SimpleExpressionNode
       const codegenNode = child.codegenNode
       if (codegenNode.type === NodeTypes.VNODE_CALL) {
-        makeBlock(codegenNode, context as any)
+        convertToBlock(codegenNode, context as any)
       }
       root.codegenNode = codegenNode
     } else {

packages/uni-app-uts/src/plugins/android/uvue/compiler/transforms/vIf.ts

@@ -27,7 +27,7 @@ import {
   getMemoedVNodeCall,
   injectProp,
   locStub,
-  makeBlock,
+  convertToBlock,
 } from '@vue/compiler-core'
 
 import {
@@ -272,7 +272,7 @@ function createChildrenCodegenNode(
     const vnodeCall = getMemoedVNodeCall(ret)
     // Change createVNode to createBlock.
     if (vnodeCall.type === NodeTypes.VNODE_CALL) {
-      makeBlock(vnodeCall, context as any)
+      convertToBlock(vnodeCall, context as any)
     }
     // inject branch key
     injectProp(vnodeCall, keyProperty, context as any)

packages/uni-app-uts/src/plugins/android/uvue/compiler/transforms/vMemo.ts

@@ -6,10 +6,10 @@ import {
   PlainElementNode,
   SourceLocation,
   WITH_MEMO,
+  convertToBlock,
   createCallExpression,
   findDir,
   locStub,
-  makeBlock,
 } from '@vue/compiler-core'
 import { NodeTransform } from '../transform'
 
@@ -29,7 +29,7 @@ export const transformMemo: NodeTransform = (node, context) => {
       if (codegenNode && codegenNode.type === NodeTypes.VNODE_CALL) {
         // non-component sub tree should be turned into a block
         if (node.tagType !== ElementTypes.COMPONENT) {
-          makeBlock(codegenNode, context as any)
+          convertToBlock(codegenNode, context as any)
         }
         const fn = createFunctionExpression(undefined, codegenNode)
         ;(fn as any).returnType = 'VNode'

packages/uni-app-vite/__tests__/nvue/__snapshots__/compiler.spec.ts.snap

@@ -9,7 +9,7 @@ export function render(_ctx, _cache) {
   return (_openBlock(), _createElementBlock("u-input", {
     modelValue: _ctx.text,
     onInput: _cache[0] || (_cache[0] = $event => ((_ctx.text) = $event.detail.value))
-  }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_1))
+  }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_1))
 }"
 `;
 
@@ -47,7 +47,7 @@ export function render(_ctx, _cache) {
   return (_openBlock(), _createElementBlock("u-textarea", {
     modelValue: _ctx.text,
     onInput: _cache[0] || (_cache[0] = $event => ((_ctx.text) = $event.detail.value))
-  }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_1))
+  }, null, 40 /* PROPS, NEED_HYDRATION */, _hoisted_1))
 }"
 `;
 
@@ -70,7 +70,7 @@ const _hoisted_2 = [
 ]
 
 export function render(_ctx, _cache) {
-  return (_openBlock(), _createElementBlock("u-video", null, _hoisted_2))
+  return (_openBlock(), _createElementBlock("u-video", null, [..._hoisted_2]))
 }"
 `;
 
@@ -84,7 +84,7 @@ const _hoisted_3 = [
 ]
 
 export function render(_ctx, _cache) {
-  return (_openBlock(), _createElementBlock("view", _hoisted_1, _hoisted_3))
+  return (_openBlock(), _createElementBlock("view", _hoisted_1, [..._hoisted_3]))
 }"
 `;
 
@@ -98,7 +98,7 @@ const _hoisted_3 = [
 ]
 
 export function render(_ctx, _cache) {
-  return (_openBlock(), _createElementBlock("view", _hoisted_1, _hoisted_3))
+  return (_openBlock(), _createElementBlock("view", _hoisted_1, [..._hoisted_3]))
 }"
 `;
 

packages/uni-app-vite/package.json

@@ -25,8 +25,8 @@
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
     "@rollup/pluginutils": "^4.2.0",
     "@vitejs/plugin-vue": "^4.2.1",
-    "@vue/compiler-dom": "3.2.47",
-    "@vue/compiler-sfc": "3.2.47",
+    "@vue/compiler-dom": "3.3.11",
+    "@vue/compiler-sfc": "3.3.11",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
     "picocolors": "^1.0.0"
@@ -34,11 +34,11 @@
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@vue/compiler-core": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
     "esbuild": "^0.17.5",
     "postcss": "^8.4.21",
     "rollup": "^3.7.0",
     "vite": "^4.0.0",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   }
 }

packages/uni-app/package.json

@@ -30,7 +30,7 @@
     "@dcloudio/uni-push": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-stat": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   },
   "peerDependencies": {
     "@dcloudio/types": "^3.3.2"

packages/uni-cli-shared/package.json

@@ -23,7 +23,7 @@
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
     "@babel/core": "^7.21.3",
-    "@babel/parser": "^7.16.4",
+    "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
     "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
@@ -31,11 +31,11 @@
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
     "@rollup/pluginutils": "^4.2.0",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/compiler-dom": "3.2.47",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/server-renderer": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
+    "@vue/compiler-dom": "3.3.11",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/server-renderer": "3.3.11",
+    "@vue/shared": "3.3.11",
     "autoprefixer": "^10.4.14",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
@@ -47,7 +47,7 @@
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
-    "jsonc-parser": "^3.0.0",
+    "jsonc-parser": "^3.2.0",
     "magic-string": "^0.30.0",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
@@ -78,6 +78,6 @@
     "@types/stylus": "^0.48.36",
     "postcss": "^8.4.21",
     "unplugin-auto-import": "^0.16.7",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   }
 }

packages/uni-cloud/package.json

@@ -23,7 +23,7 @@
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47",
+    "@vue/shared": "3.3.11",
     "fast-glob": "^3.2.11"
   }
 }

packages/uni-core/src/helpers/dom.ts

@@ -2,7 +2,10 @@ import { withModifiers } from 'vue'
 import safeAreaInsets from 'safe-area-insets'
 
 export const onEventPrevent = /*#__PURE__*/ withModifiers(() => {}, ['prevent'])
-export const onEventStop = /*#__PURE__*/ withModifiers(() => {}, ['stop'])
+export const onEventStop = /*#__PURE__*/ withModifiers(
+  (_event: Event) => {},
+  ['stop']
+)
 
 function getWindowOffsetCssVar(style: CSSStyleDeclaration, name: string) {
   return parseInt((style.getPropertyValue(name).match(/\d+/) || ['0'])[0])

packages/uni-h5-vite/package.json

@@ -22,10 +22,10 @@
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
     "@rollup/pluginutils": "^4.2.0",
-    "@vue/compiler-dom": "3.2.47",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/server-renderer": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-dom": "3.3.11",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/server-renderer": "3.3.11",
+    "@vue/shared": "3.3.11",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
     "mime": "^3.0.0",
@@ -37,8 +37,8 @@
     "@types/mime": "^2.0.3",
     "@types/module-alias": "^2.0.1",
     "@types/resolve": "^1.20.2",
-    "@vue/compiler-core": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
     "esbuild": "^0.17.5",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   }
 }

packages/uni-h5-vue/package.json

@@ -22,6 +22,6 @@
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/server-renderer": "3.2.47"
+    "@vue/server-renderer": "3.3.11"
   }
 }

packages/uni-h5/dist-x/uni-h5.cjs.js

@@ -283,8 +283,11 @@ const ViewJSBridge = /* @__PURE__ */ shared.extend(
 );
 const onEventPrevent = /* @__PURE__ */ vue.withModifiers(() => {
 }, ["prevent"]);
-const onEventStop = /* @__PURE__ */ vue.withModifiers(() => {
-}, ["stop"]);
+const onEventStop = /* @__PURE__ */ vue.withModifiers(
+  (_event) => {
+  },
+  ["stop"]
+);
 function updateCssVar(cssVars) {
   const style = document.documentElement.style;
   Object.keys(cssVars).forEach((name) => {

packages/uni-h5/dist-x/uni-h5.es.js

@@ -930,8 +930,11 @@ var out = safeAreaInsets;
 const safeAreaInsets$1 = /* @__PURE__ */ getDefaultExportFromCjs(out);
 const onEventPrevent = /* @__PURE__ */ withModifiers(() => {
 }, ["prevent"]);
-const onEventStop = /* @__PURE__ */ withModifiers(() => {
-}, ["stop"]);
+const onEventStop = /* @__PURE__ */ withModifiers(
+  (_event) => {
+  },
+  ["stop"]
+);
 function getWindowOffsetCssVar(style, name) {
   return parseInt((style.getPropertyValue(name).match(/\d+/) || ["0"])[0]);
 }

packages/uni-h5/dist/uni-h5.cjs.js

@@ -283,8 +283,11 @@ const ViewJSBridge = /* @__PURE__ */ shared.extend(
 );
 const onEventPrevent = /* @__PURE__ */ vue.withModifiers(() => {
 }, ["prevent"]);
-const onEventStop = /* @__PURE__ */ vue.withModifiers(() => {
-}, ["stop"]);
+const onEventStop = /* @__PURE__ */ vue.withModifiers(
+  (_event) => {
+  },
+  ["stop"]
+);
 function updateCssVar(cssVars) {
   const style = document.documentElement.style;
   Object.keys(cssVars).forEach((name) => {

packages/uni-h5/dist/uni-h5.es.js

@@ -930,8 +930,11 @@ var out = safeAreaInsets;
 const safeAreaInsets$1 = /* @__PURE__ */ getDefaultExportFromCjs(out);
 const onEventPrevent = /* @__PURE__ */ withModifiers(() => {
 }, ["prevent"]);
-const onEventStop = /* @__PURE__ */ withModifiers(() => {
-}, ["stop"]);
+const onEventStop = /* @__PURE__ */ withModifiers(
+  (_event) => {
+  },
+  ["stop"]
+);
 function getWindowOffsetCssVar(style, name) {
   return parseInt((style.getPropertyValue(name).match(/\d+/) || ["0"])[0]);
 }

packages/uni-h5/package.json

@@ -34,8 +34,8 @@
     "@dcloudio/uni-h5-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/server-renderer": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/server-renderer": "3.3.11",
+    "@vue/shared": "3.3.11",
     "debug": "^4.3.3",
     "localstorage-polyfill": "^1.0.1",
     "safe-area-insets": "^1.4.1",
@@ -52,6 +52,6 @@
     "acorn-loose": "^8.2.1",
     "acorn-walk": "^8.2.0",
     "estree-walker": "^2.0.2",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   }
 }

packages/uni-h5/src/view/components/video/index.tsx

@@ -445,10 +445,10 @@ function useControls(
     controlsShow,
     controlsVisible,
   })
-  function clickProgress(event: MouseEvent) {
+  function clickProgress(event: Event) {
     const $progress = progressRef.value as HTMLElement
     let element = event.target as HTMLElement
-    let x = event.offsetX
+    let x = (event as MouseEvent).offsetX
     while (element && element !== $progress) {
       x += element.offsetLeft
       element = element.parentNode as HTMLElement

packages/uni-mp-alipay/package.json

@@ -29,7 +29,7 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/shared": "3.2.47"
+    "@vue/compiler-core": "3.3.11",
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-mp-baidu/package.json

@@ -32,8 +32,8 @@
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
+    "@vue/shared": "3.3.11",
     "jimp": "^0.10.1",
     "licia": "^1.29.0",
     "qrcode-reader": "^1.0.4",

packages/uni-mp-compiler/package.json

@@ -19,18 +19,18 @@
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
     "@babel/generator": "^7.20.5",
-    "@babel/parser": "^7.16.4",
+    "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/compiler-dom": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
+    "@vue/compiler-dom": "3.3.11",
+    "@vue/shared": "3.3.11",
     "estree-walker": "^2.0.2"
   },
   "devDependencies": {
     "@types/babel__generator": "^7.6.4",
-    "@vue/compiler-sfc": "3.2.47",
+    "@vue/compiler-sfc": "3.3.11",
     "source-map-js": "^1.0.2"
   }
 }

packages/uni-mp-jd/package.json

@@ -26,7 +26,7 @@
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47"
+    "@vue/compiler-core": "3.3.11"
   },
   "dependencies": {
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
@@ -34,6 +34,6 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-mp-kuaishou/package.json

@@ -31,7 +31,7 @@
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/shared": "3.2.47"
+    "@vue/compiler-core": "3.3.11",
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-mp-lark/package.json

@@ -31,7 +31,7 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/shared": "3.2.47"
+    "@vue/compiler-core": "3.3.11",
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-mp-qq/package.json

@@ -27,14 +27,14 @@
   "devDependencies": {
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090920231203001",
     "@types/fs-extra": "^9.0.13",
-    "@vue/compiler-core": "3.2.47"
+    "@vue/compiler-core": "3.3.11"
   },
   "dependencies": {
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47",
+    "@vue/shared": "3.3.11",
     "fs-extra": "^10.0.0"
   }
 }

packages/uni-mp-toutiao/package.json

@@ -30,7 +30,7 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47",
-    "@vue/compiler-core": "3.2.47"
+    "@vue/shared": "3.3.11",
+    "@vue/compiler-core": "3.3.11"
   }
 }

packages/uni-mp-vite/package.json

@@ -22,8 +22,8 @@
     "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/shared": "3.3.11",
     "debug": "^4.3.3"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",

packages/uni-mp-vue/package.json

@@ -20,7 +20,7 @@
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   },
   "devDependencies": {
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001"

packages/uni-mp-weixin/package.json

@@ -26,14 +26,14 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@vue/compiler-core": "3.2.47"
+    "@vue/compiler-core": "3.3.11"
   },
   "dependencies": {
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47",
+    "@vue/shared": "3.3.11",
     "jimp": "^0.10.1",
     "licia": "^1.29.0",
     "qrcode-reader": "^1.0.4",

packages/uni-mp-xhs/package.json

@@ -28,7 +28,7 @@
   "devDependencies": {
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3090920231203001",
-    "@vue/compiler-core": "3.2.47"
+    "@vue/compiler-core": "3.3.11"
   },
   "dependencies": {
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090920231203001",
@@ -36,6 +36,6 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-nvue-styler/package.json

@@ -18,7 +18,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@vue/shared": "3.2.47",
+    "@vue/shared": "3.3.11",
     "parse-css-font": "^4.0.0",
     "postcss": "^8.4.23"
   }

packages/uni-quickapp-webview/package.json

@@ -32,6 +32,6 @@
     "@dcloudio/uni-mp-vite": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-mp-vue": "3.0.0-alpha-3090920231203001",
     "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-shared/package.json

@@ -20,9 +20,9 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@vue/runtime-core": "3.2.47"
+    "@vue/runtime-core": "3.3.11"
   },
   "dependencies": {
-    "@vue/shared": "3.2.47"
+    "@vue/shared": "3.3.11"
   }
 }

packages/uni-uts-v1/package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@dcloudio/uts": "3.0.0-alpha-3090920231203001",
     "@rollup/pluginutils": "^5.0.5",
-    "@vue/shared": "3.2.47",
+    "@vue/shared": "3.3.11",
     "android-versions": "^1.8.1",
     "adm-zip": "^0.5.9",
     "colors": "^1.4.0",
@@ -28,7 +28,7 @@
     "find-cache-dir": "^3.3.2",
     "fs-extra": "^10.0.0",
     "graphlib": "^2.1.8",
-    "jsonc-parser": "^3.0.0",
+    "jsonc-parser": "^3.2.0",
     "lodash": "^4.17.21",
     "md5-file": "^5.0.0",
     "object-hash": "^3.0.0",

packages/vite-plugin-uni/package.json

@@ -33,10 +33,10 @@
     "@vitejs/plugin-legacy": "^4.0.3",
     "@vitejs/plugin-vue": "^4.2.1",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
-    "@vue/compiler-core": "3.2.47",
-    "@vue/compiler-dom": "3.2.47",
-    "@vue/compiler-sfc": "3.2.47",
-    "@vue/shared": "3.2.47",
+    "@vue/compiler-core": "3.3.11",
+    "@vue/compiler-dom": "3.3.11",
+    "@vue/compiler-sfc": "3.3.11",
+    "@vue/shared": "3.3.11",
     "cac": "6.7.9",
     "debug": "^4.3.3",
     "estree-walker": "^2.0.2",
@@ -44,7 +44,7 @@
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
-    "jsonc-parser": "^3.0.0",
+    "jsonc-parser": "^3.2.0",
     "magic-string": "^0.30.0",
     "picocolors": "^1.0.0",
     "terser": "^5.4.0",
@@ -59,7 +59,7 @@
     "@vue/babel-plugin-jsx": "^1.1.1",
     "chokidar": "^3.5.3",
     "vite": "^4.0.0",
-    "vue": "3.2.47"
+    "vue": "3.3.11"
   },
   "peerDependencies": {
     "vite": "^4.0.0"