diff --git a/package.json b/package.json index dd2e1eed341732ef53fd9f1af77002f0e4b98bb8..82d49390df6a0e7cc33b220f942fc7843b4f6ba5 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "semver": "^7.3.5", "ts-jest": "^27.0.3", "typescript": "^4.5.3", - "vite": "^2.8.1", + "vite": "^2.8.2", "vue": "3.2.30", "vue-router": "^4.0.12", "yorkie": "^2.0.0" diff --git a/packages/playground/ssr/package.json b/packages/playground/ssr/package.json index 1223b969f1a5ade020992dc142b9f60bcd668af4..2c28279832dcec36af2a1167c8a71895c1a9707c 100644 --- a/packages/playground/ssr/package.json +++ b/packages/playground/ssr/package.json @@ -21,6 +21,6 @@ "compression": "^1.7.4", "cypress": "^7.3.0", "serve-static": "^1.14.1", - "vite": "^2.8.1" + "vite": "^2.8.2" } } diff --git a/packages/uni-components/dist/components.js b/packages/uni-components/dist/components.js index 3c1477da9a829bb60adc78fcdbf4e5b76d813dd3..9c89824b8b77aa40c90aacdebe58b24440cfc69b 100644 --- a/packages/uni-components/dist/components.js +++ b/packages/uni-components/dist/components.js @@ -171,7 +171,7 @@ var Label = /* @__PURE__ */ defineComponent({ handlers.length && handlers[0]($event, true); } }; - return () => createVNode("div", { + return () => createVNode("view", { "onClick": _onClick }, [slots.default && slots.default()]); } @@ -648,7 +648,7 @@ var MovableArea = defineComponent({ return () => { const defaultSlots = slots.default && slots.default(); const movableViewItems = flatVNode(defaultSlots); - return createVNode("div", mergeProps({ + return createVNode("view", mergeProps({ "class": "uni-movable-area" }, listeners), [movableViewItems]); }; @@ -1200,7 +1200,7 @@ var MovableView = defineComponent({ const attrs = { preventGesture: true }; - return createVNode("div", mergeProps({ + return createVNode("view", mergeProps({ "ref": rootRef, "onTouchstart": touchStart, "class": "uni-movable-view", diff --git a/packages/uni-components/src/nvue/label/index.tsx b/packages/uni-components/src/nvue/label/index.tsx index 5a7003b359a093db04bfdfcb40501aebd6050f24..577ec0f0498a0d95e365d71ea94d27540275e28d 100644 --- a/packages/uni-components/src/nvue/label/index.tsx +++ b/packages/uni-components/src/nvue/label/index.tsx @@ -39,7 +39,7 @@ export default /*#__PURE__*/ defineComponent({ } return () => ( -
{slots.default && slots.default()}
+ {slots.default && slots.default()} ) }, }) diff --git a/packages/uni-components/src/nvue/movable-area/index.tsx b/packages/uni-components/src/nvue/movable-area/index.tsx index 821f7a3a784eeeac02424e1a4c38fb256b792c48..52be9e0a8ca426cd746cf331630a8103a5b964a1 100644 --- a/packages/uni-components/src/nvue/movable-area/index.tsx +++ b/packages/uni-components/src/nvue/movable-area/index.tsx @@ -120,9 +120,9 @@ export default defineComponent({ const defaultSlots = slots.default && slots.default() const movableViewItems = flatVNode(defaultSlots) return ( -
+ {movableViewItems} -
+ ) } }, diff --git a/packages/uni-components/src/nvue/movable-view/index.tsx b/packages/uni-components/src/nvue/movable-view/index.tsx index cd306fe30e3d5c8680813440db832347f1f4f6d9..f4c6c665de8750291d0cc6e9147e569860550a90 100644 --- a/packages/uni-components/src/nvue/movable-view/index.tsx +++ b/packages/uni-components/src/nvue/movable-view/index.tsx @@ -148,7 +148,7 @@ export default defineComponent({ preventGesture: true, } return ( -
{slots.default && slots.default()} -
+ ) } }, diff --git a/packages/uni-components/src/nvue/picker-view-column/index.tsx b/packages/uni-components/src/nvue/picker-view-column/index.tsx index 3901eb62e5409a3dc1d3e79e8d8681f17915a27b..d72b031061b32aa52802579a5db9e435b42d686c 100644 --- a/packages/uni-components/src/nvue/picker-view-column/index.tsx +++ b/packages/uni-components/src/nvue/picker-view-column/index.tsx @@ -153,14 +153,14 @@ export default defineComponent({ } return ( -
+ -
{createScrollViewChild(children)} -
+ -
+ ) } }, diff --git a/packages/uni-components/src/nvue/picker-view/index.tsx b/packages/uni-components/src/nvue/picker-view/index.tsx index 54e15be73e75351348bbfeb68a67900d0b43a7d5..65cf3345a4b1064403f6c597b1727cab023ad941 100644 --- a/packages/uni-components/src/nvue/picker-view/index.tsx +++ b/packages/uni-components/src/nvue/picker-view/index.tsx @@ -70,15 +70,15 @@ export default defineComponent({ const defaultSlots = slots.default && slots.default() columnVNodes = flatVNode(defaultSlots) return ( -
-
{defaultSlots}
-
+ {defaultSlots} + ) } }, diff --git a/packages/vite-plugin-uni/package.json b/packages/vite-plugin-uni/package.json index 8d28f7071d3cd4fc18778c46303fe33ec98e5df4..f814417b5e2124c333b84bafd3d6c80c8d449828 100644 --- a/packages/vite-plugin-uni/package.json +++ b/packages/vite-plugin-uni/package.json @@ -53,7 +53,7 @@ "chokidar": "^3.5.3" }, "peerDependencies": { - "vite": "^2.8.1" + "vite": "^2.8.2" }, "uni-app": { "compilerVersion": "3.3.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66697a935a23a995b5604ca2cf93d1e0fe2e35b6..c06072c092564fc1c20a6259ae5d7c9836a63949 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,7 +47,7 @@ importers: semver: ^7.3.5 ts-jest: ^27.0.3 typescript: ^4.5.3 - vite: ^2.8.1 + vite: ^2.8.2 vue: 3.2.30 vue-router: ^4.0.12 yorkie: ^2.0.0 @@ -67,7 +67,7 @@ importers: '@rollup/plugin-strip': 2.1.0_rollup@2.60.2 '@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': 2.2.0_vite@2.8.2+vue@3.2.30 '@vitejs/plugin-vue-jsx': 1.3.7 '@vue/reactivity': 3.2.30 '@vue/runtime-core': 3.2.30 @@ -95,7 +95,7 @@ importers: semver: 7.3.5 ts-jest: 27.1.0_560d4ec5932803928b08544817dafdad typescript: 4.5.3 - vite: 2.8.1 + vite: 2.8.2 vue: 3.2.30 vue-router: 4.0.12_vue@3.2.30 yorkie: 2.0.0 @@ -109,7 +109,7 @@ importers: compression: ^1.7.4 cypress: ^7.3.0 serve-static: ^1.14.1 - vite: ^2.8.1 + vite: ^2.8.2 vue: 3.2.30 vue-router: ^4.0.12 vuex: ^4.0.2 @@ -125,7 +125,7 @@ importers: compression: 1.7.4 cypress: 7.7.0 serve-static: 1.14.1 - vite: 2.8.1 + vite: 2.8.2 packages/size-check: specifiers: @@ -220,7 +220,7 @@ importers: '@dcloudio/uni-nvue-styler': link:../uni-nvue-styler '@dcloudio/uni-shared': link:../uni-shared '@rollup/pluginutils': 4.1.2 - '@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30 + '@vitejs/plugin-vue': 2.2.0_vite@2.8.2+vue@3.2.30 '@vue/compiler-sfc': 3.2.30 debug: 4.3.3 fs-extra: 10.0.0 @@ -758,8 +758,8 @@ importers: '@dcloudio/uni-cli-shared': link:../uni-cli-shared '@dcloudio/uni-shared': link:../uni-shared '@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-legacy': 1.7.1_vite@2.8.2 + '@vitejs/plugin-vue': 2.2.0_vite@2.8.2+vue@3.2.30 '@vitejs/plugin-vue-jsx': 1.3.7 '@vue/compiler-core': 3.2.30 '@vue/compiler-dom': 3.2.30 @@ -3127,7 +3127,7 @@ packages: eslint-visitor-keys: 3.1.0 dev: true - /@vitejs/plugin-legacy/1.7.1_vite@2.8.1: + /@vitejs/plugin-legacy/1.7.1_vite@2.8.2: resolution: {integrity: sha512-RqgILXsGpfV7NHodVCdBVau8ss5+ynMXp6JGF/F7nhSy0bnwSQPlMS3KFqh7twfifXK8VuMriqfU4CxOiqmNnA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3138,7 +3138,7 @@ packages: magic-string: 0.25.7 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 2.8.1 + vite: 2.8.2 dev: false /@vitejs/plugin-vue-jsx/1.3.7: @@ -3154,14 +3154,14 @@ packages: transitivePeerDependencies: - supports-color - /@vitejs/plugin-vue/2.2.0_vite@2.8.1+vue@3.2.30: + /@vitejs/plugin-vue/2.2.0_vite@2.8.2+vue@3.2.30: resolution: {integrity: sha512-wXigM1EwN2G7rZcwG6kLk9ivvIMhx2363tCEvMBiXcTu5nePM/12hUPVzPb83Uugt6U+zom1gTpJopi/Ow/jwg==} engines: {node: '>=12.0.0'} peerDependencies: vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 2.8.1 + vite: 2.8.2 vue: 3.2.30 /@vue/babel-helper-vue-transform-on/1.0.2: @@ -8566,8 +8566,8 @@ packages: extsprintf: 1.3.0 dev: true - /vite/2.8.1: - resolution: {integrity: sha512-Typ8qjUnW0p53gBsJpisrKcZlEbUPZATja9BG6Z09QZjg9YrnEn/htkr/VH4WhnH7eNUQeSD+wKI1lHzQRWskw==} + /vite/2.8.2: + resolution: {integrity: sha512-zawfykcPVPYva4KusIWORNLr324Qx86/3NpfQSIOJdjnL5pYhwDoImLYMOh4lFLcP/7//tNuWM2vx2F5OSVC9w==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: