build: sync and lock vue version

JackTony123 · Apr 24, 2024 · 8b4c2bb · 8b4c2bb
1 parent 41f9fb5
commit 8b4c2bb
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 59 deletions.
diff --git a/common/config/package.json b/common/config/package.json
@@ -33,9 +33,6 @@
     "@vexip-ui/utils": "workspace:*",
     "lucide-vue-next": "^0.365.0"
   },
-  "devDependencies": {
-    "vue": "^3.4.21"
-  },
   "peerDependencies": {
     "vue": "^3.2.25"
   }

diff --git a/common/hooks/package.json b/common/hooks/package.json
@@ -35,9 +35,6 @@
     "@juggle/resize-observer": "^3.4.0",
     "@vexip-ui/utils": "workspace:*"
   },
-  "devDependencies": {
-    "vue": "^3.4.21"
-  },
   "peerDependencies": {
     "vue": "^3.2.25"
   }

diff --git a/common/icons/package.json b/common/icons/package.json
@@ -53,8 +53,7 @@
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "kolorist": "^1.8.0",
-    "prettier": "^3.2.5",
-    "vue": "^3.4.21"
+    "prettier": "^3.2.5"
   },
   "peerDependencies": {
     "vue": "^3.2.25"

diff --git a/components/switch/tests/switch.spec.tsx b/components/switch/tests/switch.spec.tsx
@@ -2,7 +2,8 @@ import { describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { mount } from '@vue/test-utils'
 
-import { Github, Loader2, User } from 'lucide-vue-next'
+import { Hammer, User } from 'lucide-vue-next'
+import { globalIcons } from '@vexip-ui/config'
 import { Switch } from '..'
 
 describe('Switch', () => {
@@ -97,11 +98,11 @@ describe('Switch', () => {
     const wrapper = mount(Switch)
 
     expect(wrapper.classes()).not.toContain('vxp-switch--loading')
-    expect(wrapper.findComponent(Loader2).exists()).toBe(false)
+    expect(wrapper.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
 
     await wrapper.setProps({ loading: true })
     expect(wrapper.classes()).toContain('vxp-switch--loading')
-    expect(wrapper.findComponent(Loader2).exists()).toBe(true)
+    expect(wrapper.findComponent(globalIcons.value.loading.icon).exists()).toBe(true)
   })
 
   it('inner text', async () => {
@@ -126,21 +127,21 @@ describe('Switch', () => {
   it('icon', async () => {
     const wrapper = mount(Switch, {
       props: {
-        openIcon: Github,
+        openIcon: Hammer,
         closeIcon: User
       }
     })
 
     expect(wrapper.findComponent(User).exists()).toBe(true)
-    expect(wrapper.findComponent(Github).exists()).toBe(false)
+    expect(wrapper.findComponent(Hammer).exists()).toBe(false)
 
     await wrapper.setProps({ value: true })
     expect(wrapper.findComponent(User).exists()).toBe(false)
-    expect(wrapper.findComponent(Github).exists()).toBe(true)
+    expect(wrapper.findComponent(Hammer).exists()).toBe(true)
 
     await wrapper.setProps({ loading: true })
     expect(wrapper.findComponent(User).exists()).toBe(false)
-    expect(wrapper.findComponent(Github).exists()).toBe(false)
+    expect(wrapper.findComponent(Hammer).exists()).toBe(false)
   })
 
   it('before change', async () => {

diff --git a/components/textarea/tests/textarea.spec.tsx b/components/textarea/tests/textarea.spec.tsx
@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { mount } from '@vue/test-utils'
 
-import { Loader2 } from 'lucide-vue-next'
+import { globalIcons } from '@vexip-ui/config'
 import { Textarea } from '..'
 
 import type { DOMWrapper } from '@vue/test-utils'
@@ -69,11 +69,11 @@ describe('Textarea', () => {
     const wrapper = mount(Textarea)
 
     expect(wrapper.find('.vxp-textarea__loading').exists()).toBe(false)
-    expect(wrapper.findComponent(Loader2).exists()).toBe(false)
+    expect(wrapper.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
 
     await wrapper.setProps({ loading: true })
     expect(wrapper.find('.vxp-textarea__loading').exists()).toBe(true)
-    expect(wrapper.findComponent(Loader2).exists()).toBe(true)
+    expect(wrapper.findComponent(globalIcons.value.loading.icon).exists()).toBe(true)
   })
 
   it('loading lock', async () => {

diff --git a/components/transfer/tests/transfer.spec.tsx b/components/transfer/tests/transfer.spec.tsx
@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from 'vitest'
 import { mount } from '@vue/test-utils'
 
-import { Github, Loader2 } from 'lucide-vue-next'
+import { User } from 'lucide-vue-next'
+import { globalIcons } from '@vexip-ui/config'
 import { Transfer } from '..'
 
 import type { VueWrapper } from '@vue/test-utils'
@@ -182,24 +183,24 @@ describe('Transfer', () => {
     const { source, target } = getPanels(wrapper)
 
     expect(source.find('.vxp-transfer__loading').exists()).toBe(false)
-    expect(source.findComponent(Loader2).exists()).toBe(false)
+    expect(source.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
     expect(target.find('.vxp-transfer__loading').exists()).toBe(false)
-    expect(target.findComponent(Loader2).exists()).toBe(false)
+    expect(target.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
 
     await wrapper.setProps({ loading: true })
     expect(source.find('.vxp-transfer__loading').exists()).toBe(true)
-    expect(source.findComponent(Loader2).exists()).toBe(true)
+    expect(source.findComponent(globalIcons.value.loading.icon).exists()).toBe(true)
     expect(target.find('.vxp-transfer__loading').exists()).toBe(true)
-    expect(target.findComponent(Loader2).exists()).toBe(true)
+    expect(target.findComponent(globalIcons.value.loading.icon).exists()).toBe(true)
   })
 
   it('loading icon', () => {
-    const wrapper = mount(() => <Transfer loading loading-icon={Github}></Transfer>)
+    const wrapper = mount(() => <Transfer loading loading-icon={User}></Transfer>)
     const { source, target } = getPanels(wrapper)
 
-    expect(source.findComponent(Loader2).exists()).toBe(false)
-    expect(source.findComponent(Github).exists()).toBe(true)
-    expect(target.findComponent(Loader2).exists()).toBe(false)
-    expect(target.findComponent(Github).exists()).toBe(true)
+    expect(source.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
+    expect(source.findComponent(User).exists()).toBe(true)
+    expect(target.findComponent(globalIcons.value.loading.icon).exists()).toBe(false)
+    expect(target.findComponent(User).exists()).toBe(true)
   })
 })
diff --git a/dev-server/package.json b/dev-server/package.json
@@ -5,10 +5,6 @@
   "scripts": {
     "serve": "vite"
   },
-  "dependencies": {
-    "vue": "^3.4.21",
-    "vue-router": "^4.3.0"
-  },
   "devDependencies": {
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",

diff --git a/package.json b/package.json
@@ -201,7 +201,7 @@
     "vite": "^5.2.8",
     "vite-plugin-dts": "^3.8.2",
     "vitest": "1.1.3",
-    "vue": "^3.4.21",
+    "vue": "~3.3.13",
     "vue-router": "^4.3.0"
   },
   "peerDependencies": {