From 9d0aed77adc3b9338c6147abebd87e0df9d01c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Sat, 22 Jan 2022 09:54:23 +0800 Subject: [PATCH] fix: upgrade vueuse, closes #5313, #5362 (#5543) --- package.json | 4 +-- packages/element-plus/package.json | 4 +-- play/package.json | 2 +- pnpm-lock.yaml | 57 +++++++++++++++++++++++------- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 80a052cbf4..0890bfd959 100644 --- a/package.json +++ b/package.json @@ -55,14 +55,14 @@ "@element-plus/components": "workspace:*", "@element-plus/directives": "workspace:*", "@element-plus/hooks": "workspace:*", - "@element-plus/icons-vue": "^0.2.4", + "@element-plus/icons-vue": "^0.2.6", "@element-plus/locale": "workspace:*", "@element-plus/test-utils": "workspace:*", "@element-plus/theme-chalk": "workspace:*", "@element-plus/tokens": "workspace:*", "@element-plus/utils": "workspace:*", "@popperjs/core": "^2.11.2", - "@vueuse/core": "^7.5.3", + "@vueuse/core": "^7.5.4", "async-validator": "^4.0.7", "dayjs": "^1.10.7", "lodash": "^4.17.21", diff --git a/packages/element-plus/package.json b/packages/element-plus/package.json index 8ed99b4e7f..693c3a6f8c 100644 --- a/packages/element-plus/package.json +++ b/packages/element-plus/package.json @@ -45,9 +45,9 @@ }, "dependencies": { "@ctrl/tinycolor": "^3.4.0", - "@element-plus/icons-vue": "^0.2.4", + "@element-plus/icons-vue": "^0.2.6", "@popperjs/core": "^2.11.2", - "@vueuse/core": "^7.5.3", + "@vueuse/core": "^7.5.4", "async-validator": "^4.0.7", "dayjs": "^1.10.7", "lodash": "^4.17.21", diff --git a/play/package.json b/play/package.json index fd4fee8c88..33f83564d6 100644 --- a/play/package.json +++ b/play/package.json @@ -7,7 +7,7 @@ "preview": "vite preview" }, "dependencies": { - "@element-plus/icons-vue": "^0.2.4" + "@element-plus/icons-vue": "^0.2.6" }, "devDependencies": { "@vitejs/plugin-vue": "2.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5df5b00d27..3676852339 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ importers: '@element-plus/components': workspace:* '@element-plus/directives': workspace:* '@element-plus/hooks': workspace:* - '@element-plus/icons-vue': ^0.2.4 + '@element-plus/icons-vue': ^0.2.6 '@element-plus/locale': workspace:* '@element-plus/test-utils': workspace:* '@element-plus/theme-chalk': workspace:* @@ -32,7 +32,7 @@ importers: '@typescript-eslint/eslint-plugin': 5.10.0 '@typescript-eslint/parser': 5.10.0 '@vue/test-utils': 2.0.0-rc.16 - '@vueuse/core': ^7.5.3 + '@vueuse/core': ^7.5.4 async-validator: ^4.0.7 chalk: 4.1.2 components-helper: 1.0.5 @@ -79,14 +79,14 @@ importers: '@element-plus/components': link:packages/components '@element-plus/directives': link:packages/directives '@element-plus/hooks': link:packages/hooks - '@element-plus/icons-vue': 0.2.4_vue@3.2.27 + '@element-plus/icons-vue': 0.2.6_vue@3.2.27 '@element-plus/locale': link:packages/locale '@element-plus/test-utils': link:packages/test-utils '@element-plus/theme-chalk': link:packages/theme-chalk '@element-plus/tokens': link:packages/tokens '@element-plus/utils': link:packages/utils '@popperjs/core': 2.11.2 - '@vueuse/core': 7.5.3_vue@3.2.27 + '@vueuse/core': 7.5.4_vue@3.2.27 async-validator: 4.0.7 dayjs: 1.10.7 lodash: 4.17.21 @@ -205,10 +205,10 @@ importers: packages/element-plus: specifiers: '@ctrl/tinycolor': ^3.4.0 - '@element-plus/icons-vue': ^0.2.4 + '@element-plus/icons-vue': ^0.2.6 '@popperjs/core': ^2.11.2 '@types/node': '*' - '@vueuse/core': ^7.5.3 + '@vueuse/core': ^7.5.4 async-validator: ^4.0.7 csstype: ^2.6.19 dayjs: ^1.10.7 @@ -218,9 +218,9 @@ importers: vue-router: ^4.0.0 dependencies: '@ctrl/tinycolor': 3.4.0 - '@element-plus/icons-vue': 0.2.4_vue@3.2.27 + '@element-plus/icons-vue': 0.2.6_vue@3.2.27 '@popperjs/core': 2.11.2 - '@vueuse/core': 7.5.3_vue@3.2.27 + '@vueuse/core': 7.5.4_vue@3.2.27 async-validator: 4.0.7 dayjs: 1.10.7 lodash: 4.17.21 @@ -268,13 +268,13 @@ importers: play: specifiers: - '@element-plus/icons-vue': ^0.2.4 + '@element-plus/icons-vue': ^0.2.6 '@vitejs/plugin-vue': 2.0.1 unplugin-vue-components: 0.17.13 vite: 2.7.13 vite-plugin-inspect: 0.3.13 dependencies: - '@element-plus/icons-vue': 0.2.4_vue@3.2.27 + '@element-plus/icons-vue': 0.2.6_vue@3.2.27 devDependencies: '@vitejs/plugin-vue': 2.0.1_vite@2.7.13+vue@3.2.27 unplugin-vue-components: 0.17.13_711f3b8efc55779a16e7a8e9a11011e6 @@ -1037,8 +1037,8 @@ packages: transitivePeerDependencies: - '@algolia/client-search' - /@element-plus/icons-vue/0.2.4_vue@3.2.27: - resolution: {integrity: sha512-RsJNyL58rwxtsjeMy34o8txkL6UlME1stWsUlRpTac6UE9Bx9gdJvnDXbIKhOJqBLX17fBjmposdrn6VTqim2w==} + /@element-plus/icons-vue/0.2.6_vue@3.2.27: + resolution: {integrity: sha512-2gg7VCq4d2firgl7/aVym4Cx/wqKFwKybEQGJiiWJN4urW36+QdAEG1knqSD9qidbjhVp0Jnc9XdSTR1/4Whzw==} peerDependencies: vue: ^3.2.0 dependencies: @@ -2323,6 +2323,22 @@ packages: vue-demi: 0.12.1_vue@3.2.27 dev: false + /@vueuse/core/7.5.4_vue@3.2.27: + resolution: {integrity: sha512-PKmyHN2lZuttGgKmsoMMqiSojSYYKraszilP0gpQIGcLt2YoLABaG3VFjdPs2tY6DM+HG3o70HuzOMEQCY8fqQ==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + '@vueuse/shared': 7.5.4_vue@3.2.27 + vue: 3.2.27 + vue-demi: 0.12.1_vue@3.2.27 + dev: false + /@vueuse/shared/7.5.3_vue@3.2.27: resolution: {integrity: sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==} peerDependencies: @@ -2338,6 +2354,21 @@ packages: vue-demi: 0.12.1_vue@3.2.27 dev: false + /@vueuse/shared/7.5.4_vue@3.2.27: + resolution: {integrity: sha512-750RnGUEgg1+K4jGVkv7M5UOStAa/IjAInV6BugyBOvRYL2l1lcIDUi4V/qIKTlhd2oUAByCEnlqIpFD2a3tfw==} + peerDependencies: + '@vue/composition-api': ^1.1.0 + vue: ^2.6.0 || ^3.2.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + vue: + optional: true + dependencies: + vue: 3.2.27 + vue-demi: 0.12.1_vue@3.2.27 + dev: false + /@windicss/config/1.6.3: resolution: {integrity: sha512-1kjdy4tyYLD4sCB4DS+3Lt1Odnde03z4Rz3EUqyWJ7SiBEWMgRk1L797SsgEH4+W1DjLBZLs1SVYzaTO/3UdJA==} dependencies: @@ -4211,7 +4242,7 @@ packages: vue: ^3.2.0 dependencies: '@ctrl/tinycolor': 3.4.0 - '@element-plus/icons-vue': 0.2.4_vue@3.2.27 + '@element-plus/icons-vue': 0.2.6_vue@3.2.27 '@popperjs/core': 2.11.2 '@vueuse/core': 7.5.3_vue@3.2.27 async-validator: 4.0.7