diff --git a/.prettierignore b/.prettierignore index 6b66b07..77134df 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,5 @@ +node_modules + # unplugin-auto-import 生成的类型文件,每次提交都改变,所以加入这里吧,与 .gitignore 配合使用 auto-import.d.ts 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 693dc14..cada9c9 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: .: @@ -25,7 +30,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)) @@ -6802,7 +6807,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' @@ -6855,7 +6860,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 new file mode 100644 index 0000000..848a6d9 --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +patchedDependencies: + '@dcloudio/uni-h5': patches/@dcloudio__uni-h5.patch