From 1b76f428bcb563ddf3df1ef9778877d94251d519 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Sat, 5 Jul 2025 10:16:14 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"chore:=20=E7=A7=BB=E9=99=A4=E5=AF=B9@?= =?UTF-8?q?dcloudio/uni-h5=E7=9A=84=E8=A1=A5=E4=B8=81=E4=BE=9D=E8=B5=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 761312dee8b11d737783fc867788e84cbab58da4. --- patches/@dcloudio__uni-h5.patch | 13 +++++++++++++ pnpm-lock.yaml | 11 ++++++++--- pnpm-workspace.yaml | 3 +++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 patches/@dcloudio__uni-h5.patch diff --git a/patches/@dcloudio__uni-h5.patch b/patches/@dcloudio__uni-h5.patch new file mode 100644 index 0000000..ff1e37c --- /dev/null +++ b/patches/@dcloudio__uni-h5.patch @@ -0,0 +1,13 @@ +diff --git a/dist/uni-h5.es.js b/dist/uni-h5.es.js +index 7421bad97d94ad34a3d4d94292a9ee9071430662..19c6071ee4036ceb8d1cfa09030e471c002d2cda 100644 +--- a/dist/uni-h5.es.js ++++ b/dist/uni-h5.es.js +@@ -23410,7 +23410,7 @@ function useShowTabBar(emit2) { + const tabBar2 = useTabBar(); + const showTabBar2 = computed(() => route.meta.isTabBar && tabBar2.shown); + updateCssVar({ +- "--tab-bar-height": tabBar2.height ++ "--tab-bar-height": tabBar2?.height || 0 + }); + return showTabBar2; + } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1a7450f..f3e1f44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,11 @@ settings: overrides: bin-wrapper: npm:bin-wrapper-china +patchedDependencies: + '@dcloudio/uni-h5': + hash: 5763725268e9a493075be3c82d91b590b9ae30e997a04a418494dd7d6d327b9d + path: patches/@dcloudio__uni-h5.patch + importers: .: @@ -31,7 +36,7 @@ importers: version: 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) '@dcloudio/uni-h5': specifier: 3.0.0-4060620250520001 - version: 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) + version: 3.0.0-4060620250520001(patch_hash=5763725268e9a493075be3c82d91b590b9ae30e997a04a418494dd7d6d327b9d)(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) '@dcloudio/uni-mp-alipay': specifier: 3.0.0-4060620250520001 version: 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) @@ -7775,7 +7780,7 @@ snapshots: '@dcloudio/uni-components@3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2))': dependencies: '@dcloudio/uni-cloud': 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) - '@dcloudio/uni-h5': 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) + '@dcloudio/uni-h5': 3.0.0-4060620250520001(patch_hash=5763725268e9a493075be3c82d91b590b9ae30e997a04a418494dd7d6d327b9d)(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) '@dcloudio/uni-i18n': 3.0.0-4060620250520001 transitivePeerDependencies: - '@nuxt/kit' @@ -7828,7 +7833,7 @@ snapshots: transitivePeerDependencies: - vue - '@dcloudio/uni-h5@3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2))': + '@dcloudio/uni-h5@3.0.0-4060620250520001(patch_hash=5763725268e9a493075be3c82d91b590b9ae30e997a04a418494dd7d6d327b9d)(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2))': dependencies: '@dcloudio/uni-h5-vite': 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vue@3.5.15(typescript@5.7.2)) '@dcloudio/uni-h5-vue': 3.0.0-4060620250520001(vue@3.5.15(typescript@5.7.2)) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1e8c39b..82e3c6c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,6 @@ packages: - '**' - '!node_modules' + +patchedDependencies: + '@dcloudio/uni-h5': patches/@dcloudio__uni-h5.patch