fix: uprade deps and resolve type conflicts
This commit is contained in:
		
							parent
							
								
									af42fbac63
								
							
						
					
					
						commit
						11fe28fc53
					
				
							
								
								
									
										8
									
								
								cypress/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								cypress/tsconfig.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  "extends": "../tsconfig.json",
 | 
				
			||||||
 | 
					  "compilerOptions": {
 | 
				
			||||||
 | 
					    "types": [
 | 
				
			||||||
 | 
					      "cypress"
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										26
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								package.json
									
									
									
									
									
								
							@ -12,10 +12,10 @@
 | 
				
			|||||||
    "typecheck": "vue-tsc --noEmit"
 | 
					    "typecheck": "vue-tsc --noEmit"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
    "@vueuse/core": "^7.5.4",
 | 
					    "@vueuse/core": "^7.5.5",
 | 
				
			||||||
    "@vueuse/head": "^0.7.5",
 | 
					    "@vueuse/head": "^0.7.5",
 | 
				
			||||||
    "nprogress": "^0.2.0",
 | 
					    "nprogress": "^0.2.0",
 | 
				
			||||||
    "pinia": "^2.0.9",
 | 
					    "pinia": "^2.0.11",
 | 
				
			||||||
    "prism-theme-vars": "^0.2.2",
 | 
					    "prism-theme-vars": "^0.2.2",
 | 
				
			||||||
    "vue": "^3.2.29",
 | 
					    "vue": "^3.2.29",
 | 
				
			||||||
    "vue-demi": "^0.12.1",
 | 
					    "vue-demi": "^0.12.1",
 | 
				
			||||||
@ -23,35 +23,35 @@
 | 
				
			|||||||
    "vue-router": "^4.0.12"
 | 
					    "vue-router": "^4.0.12"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "@antfu/eslint-config": "^0.16.0",
 | 
					    "@antfu/eslint-config": "^0.16.1",
 | 
				
			||||||
    "@iconify-json/carbon": "^1.0.14",
 | 
					    "@iconify-json/carbon": "^1.0.14",
 | 
				
			||||||
    "@intlify/vite-plugin-vue-i18n": "^3.2.1",
 | 
					    "@intlify/vite-plugin-vue-i18n": "^3.2.2",
 | 
				
			||||||
    "@types/markdown-it-link-attributes": "^3.0.1",
 | 
					    "@types/markdown-it-link-attributes": "^3.0.1",
 | 
				
			||||||
    "@types/nprogress": "^0.2.0",
 | 
					    "@types/nprogress": "^0.2.0",
 | 
				
			||||||
    "@vitejs/plugin-vue": "^2.1.0",
 | 
					    "@vitejs/plugin-vue": "^2.1.0",
 | 
				
			||||||
    "@vue/test-utils": "^2.0.0-rc.18",
 | 
					    "@vue/test-utils": "^2.0.0-rc.18",
 | 
				
			||||||
    "critters": "^0.0.16",
 | 
					    "critters": "^0.0.16",
 | 
				
			||||||
    "cross-env": "^7.0.3",
 | 
					    "cross-env": "^7.0.3",
 | 
				
			||||||
    "cypress": "^9.3.1",
 | 
					    "cypress": "^9.4.1",
 | 
				
			||||||
    "eslint": "^8.7.0",
 | 
					    "eslint": "^8.8.0",
 | 
				
			||||||
    "eslint-plugin-cypress": "^2.12.1",
 | 
					    "eslint-plugin-cypress": "^2.12.1",
 | 
				
			||||||
    "https-localhost": "^4.7.0",
 | 
					    "https-localhost": "^4.7.0",
 | 
				
			||||||
    "markdown-it-link-attributes": "^4.0.0",
 | 
					    "markdown-it-link-attributes": "^4.0.0",
 | 
				
			||||||
    "markdown-it-prism": "^2.2.2",
 | 
					    "markdown-it-prism": "^2.2.2",
 | 
				
			||||||
    "pnpm": "^6.28.0",
 | 
					    "pnpm": "^6.30.0",
 | 
				
			||||||
    "typescript": "^4.5.5",
 | 
					    "typescript": "^4.5.5",
 | 
				
			||||||
    "unplugin-auto-import": "^0.5.11",
 | 
					    "unplugin-auto-import": "^0.5.11",
 | 
				
			||||||
    "unplugin-icons": "^0.13.0",
 | 
					    "unplugin-icons": "^0.13.0",
 | 
				
			||||||
    "unplugin-vue-components": "^0.17.14",
 | 
					    "unplugin-vue-components": "^0.17.17",
 | 
				
			||||||
    "vite": "^2.7.13",
 | 
					    "vite": "^2.7.13",
 | 
				
			||||||
    "vite-plugin-inspect": "^0.3.13",
 | 
					    "vite-plugin-inspect": "^0.3.13",
 | 
				
			||||||
    "vite-plugin-md": "^0.11.7",
 | 
					    "vite-plugin-md": "^0.11.7",
 | 
				
			||||||
    "vite-plugin-pages": "^0.20.0",
 | 
					    "vite-plugin-pages": "^0.20.1",
 | 
				
			||||||
    "vite-plugin-pwa": "^0.11.13",
 | 
					    "vite-plugin-pwa": "^0.11.13",
 | 
				
			||||||
    "vite-plugin-vue-layouts": "^0.5.0",
 | 
					    "vite-plugin-vue-layouts": "^0.6.0",
 | 
				
			||||||
    "vite-plugin-windicss": "^1.6.3",
 | 
					    "vite-plugin-windicss": "^1.6.3",
 | 
				
			||||||
    "vite-ssg": "^0.17.7",
 | 
					    "vite-ssg": "^0.17.10",
 | 
				
			||||||
    "vitest": "0.1.27",
 | 
					    "vitest": "^0.2.7",
 | 
				
			||||||
    "vue-tsc": "^0.31.1"
 | 
					    "vue-tsc": "^0.31.2"
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										495
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										495
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										14
									
								
								src/auto-imports.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								src/auto-imports.d.ts
									
									
									
									
										vendored
									
									
								
							@ -1,15 +1,9 @@
 | 
				
			|||||||
// Generated by 'unplugin-auto-import'
 | 
					// Generated by 'unplugin-auto-import'
 | 
				
			||||||
// We suggest you to commit this file into source control
 | 
					// We suggest you to commit this file into source control
 | 
				
			||||||
declare global {
 | 
					declare global {
 | 
				
			||||||
  const afterAll: typeof import('vitest')['afterAll']
 | 
					 | 
				
			||||||
  const afterEach: typeof import('vitest')['afterEach']
 | 
					 | 
				
			||||||
  const assert: typeof import('vitest')['assert']
 | 
					 | 
				
			||||||
  const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
 | 
					  const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
 | 
				
			||||||
  const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
 | 
					  const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
 | 
				
			||||||
  const beforeAll: typeof import('vitest')['beforeAll']
 | 
					 | 
				
			||||||
  const beforeEach: typeof import('vitest')['beforeEach']
 | 
					 | 
				
			||||||
  const biSyncRef: typeof import('@vueuse/core')['biSyncRef']
 | 
					  const biSyncRef: typeof import('@vueuse/core')['biSyncRef']
 | 
				
			||||||
  const chai: typeof import('vitest')['chai']
 | 
					 | 
				
			||||||
  const computed: typeof import('vue')['computed']
 | 
					  const computed: typeof import('vue')['computed']
 | 
				
			||||||
  const computedInject: typeof import('@vueuse/core')['computedInject']
 | 
					  const computedInject: typeof import('@vueuse/core')['computedInject']
 | 
				
			||||||
  const controlledComputed: typeof import('@vueuse/core')['controlledComputed']
 | 
					  const controlledComputed: typeof import('@vueuse/core')['controlledComputed']
 | 
				
			||||||
@ -25,11 +19,9 @@ declare global {
 | 
				
			|||||||
  const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch']
 | 
					  const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch']
 | 
				
			||||||
  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
 | 
					  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
 | 
				
			||||||
  const defineComponent: typeof import('vue')['defineComponent']
 | 
					  const defineComponent: typeof import('vue')['defineComponent']
 | 
				
			||||||
  const describe: typeof import('vitest')['describe']
 | 
					 | 
				
			||||||
  const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
 | 
					  const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
 | 
				
			||||||
  const effectScope: typeof import('vue')['effectScope']
 | 
					  const effectScope: typeof import('vue')['effectScope']
 | 
				
			||||||
  const EffectScope: typeof import('vue')['EffectScope']
 | 
					  const EffectScope: typeof import('vue')['EffectScope']
 | 
				
			||||||
  const expect: typeof import('vitest')['expect']
 | 
					 | 
				
			||||||
  const extendRef: typeof import('@vueuse/core')['extendRef']
 | 
					  const extendRef: typeof import('@vueuse/core')['extendRef']
 | 
				
			||||||
  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
 | 
					  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
 | 
				
			||||||
  const getCurrentScope: typeof import('vue')['getCurrentScope']
 | 
					  const getCurrentScope: typeof import('vue')['getCurrentScope']
 | 
				
			||||||
@ -39,7 +31,6 @@ declare global {
 | 
				
			|||||||
  const isDefined: typeof import('@vueuse/core')['isDefined']
 | 
					  const isDefined: typeof import('@vueuse/core')['isDefined']
 | 
				
			||||||
  const isReadonly: typeof import('vue')['isReadonly']
 | 
					  const isReadonly: typeof import('vue')['isReadonly']
 | 
				
			||||||
  const isRef: typeof import('vue')['isRef']
 | 
					  const isRef: typeof import('vue')['isRef']
 | 
				
			||||||
  const it: typeof import('vitest')['it']
 | 
					 | 
				
			||||||
  const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable']
 | 
					  const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable']
 | 
				
			||||||
  const markRaw: typeof import('vue')['markRaw']
 | 
					  const markRaw: typeof import('vue')['markRaw']
 | 
				
			||||||
  const nextTick: typeof import('vue')['nextTick']
 | 
					  const nextTick: typeof import('vue')['nextTick']
 | 
				
			||||||
@ -72,10 +63,8 @@ declare global {
 | 
				
			|||||||
  const shallowReactive: typeof import('vue')['shallowReactive']
 | 
					  const shallowReactive: typeof import('vue')['shallowReactive']
 | 
				
			||||||
  const shallowReadonly: typeof import('vue')['shallowReadonly']
 | 
					  const shallowReadonly: typeof import('vue')['shallowReadonly']
 | 
				
			||||||
  const shallowRef: typeof import('vue')['shallowRef']
 | 
					  const shallowRef: typeof import('vue')['shallowRef']
 | 
				
			||||||
  const suite: typeof import('vitest')['suite']
 | 
					 | 
				
			||||||
  const syncRef: typeof import('@vueuse/core')['syncRef']
 | 
					  const syncRef: typeof import('@vueuse/core')['syncRef']
 | 
				
			||||||
  const templateRef: typeof import('@vueuse/core')['templateRef']
 | 
					  const templateRef: typeof import('@vueuse/core')['templateRef']
 | 
				
			||||||
  const test: typeof import('vitest')['test']
 | 
					 | 
				
			||||||
  const throttledRef: typeof import('@vueuse/core')['throttledRef']
 | 
					  const throttledRef: typeof import('@vueuse/core')['throttledRef']
 | 
				
			||||||
  const throttledWatch: typeof import('@vueuse/core')['throttledWatch']
 | 
					  const throttledWatch: typeof import('@vueuse/core')['throttledWatch']
 | 
				
			||||||
  const toRaw: typeof import('vue')['toRaw']
 | 
					  const toRaw: typeof import('vue')['toRaw']
 | 
				
			||||||
@ -183,6 +172,7 @@ declare global {
 | 
				
			|||||||
  const useSpeechSynthesis: typeof import('@vueuse/core')['useSpeechSynthesis']
 | 
					  const useSpeechSynthesis: typeof import('@vueuse/core')['useSpeechSynthesis']
 | 
				
			||||||
  const useStorage: typeof import('@vueuse/core')['useStorage']
 | 
					  const useStorage: typeof import('@vueuse/core')['useStorage']
 | 
				
			||||||
  const useStorageAsync: typeof import('@vueuse/core')['useStorageAsync']
 | 
					  const useStorageAsync: typeof import('@vueuse/core')['useStorageAsync']
 | 
				
			||||||
 | 
					  const useStyleTag: typeof import('@vueuse/core')['useStyleTag']
 | 
				
			||||||
  const useSwipe: typeof import('@vueuse/core')['useSwipe']
 | 
					  const useSwipe: typeof import('@vueuse/core')['useSwipe']
 | 
				
			||||||
  const useTemplateRefsList: typeof import('@vueuse/core')['useTemplateRefsList']
 | 
					  const useTemplateRefsList: typeof import('@vueuse/core')['useTemplateRefsList']
 | 
				
			||||||
  const useTextSelection: typeof import('@vueuse/core')['useTextSelection']
 | 
					  const useTextSelection: typeof import('@vueuse/core')['useTextSelection']
 | 
				
			||||||
@ -210,8 +200,6 @@ declare global {
 | 
				
			|||||||
  const useWindowFocus: typeof import('@vueuse/core')['useWindowFocus']
 | 
					  const useWindowFocus: typeof import('@vueuse/core')['useWindowFocus']
 | 
				
			||||||
  const useWindowScroll: typeof import('@vueuse/core')['useWindowScroll']
 | 
					  const useWindowScroll: typeof import('@vueuse/core')['useWindowScroll']
 | 
				
			||||||
  const useWindowSize: typeof import('@vueuse/core')['useWindowSize']
 | 
					  const useWindowSize: typeof import('@vueuse/core')['useWindowSize']
 | 
				
			||||||
  const vi: typeof import('vitest')['vi']
 | 
					 | 
				
			||||||
  const vitest: typeof import('vitest')['vitest']
 | 
					 | 
				
			||||||
  const watch: typeof import('vue')['watch']
 | 
					  const watch: typeof import('vue')['watch']
 | 
				
			||||||
  const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
 | 
					  const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
 | 
				
			||||||
  const watchEffect: typeof import('vue')['watchEffect']
 | 
					  const watchEffect: typeof import('vue')['watchEffect']
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,5 @@
 | 
				
			|||||||
 | 
					import { describe, expect, it } from 'vitest'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
describe('tests', () => {
 | 
					describe('tests', () => {
 | 
				
			||||||
  it('should works', () => {
 | 
					  it('should works', () => {
 | 
				
			||||||
    expect(1 + 1).toEqual(2)
 | 
					    expect(1 + 1).toEqual(2)
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,5 @@
 | 
				
			|||||||
import { mount } from '@vue/test-utils'
 | 
					import { mount } from '@vue/test-utils'
 | 
				
			||||||
 | 
					import { describe, expect, it } from 'vitest'
 | 
				
			||||||
import Counter from '../src/components/Counter.vue'
 | 
					import Counter from '../src/components/Counter.vue'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
describe('Counter.vue', () => {
 | 
					describe('Counter.vue', () => {
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,6 @@
 | 
				
			|||||||
    "strictNullChecks": true,
 | 
					    "strictNullChecks": true,
 | 
				
			||||||
    "forceConsistentCasingInFileNames": true,
 | 
					    "forceConsistentCasingInFileNames": true,
 | 
				
			||||||
    "types": [
 | 
					    "types": [
 | 
				
			||||||
      "cypress",
 | 
					 | 
				
			||||||
      "vite/client",
 | 
					      "vite/client",
 | 
				
			||||||
      "vite-plugin-pages/client",
 | 
					      "vite-plugin-pages/client",
 | 
				
			||||||
      "vite-plugin-vue-layouts/client"
 | 
					      "vite-plugin-vue-layouts/client"
 | 
				
			||||||
 | 
				
			|||||||
@ -44,7 +44,6 @@ export default defineConfig({
 | 
				
			|||||||
        'vue-i18n',
 | 
					        'vue-i18n',
 | 
				
			||||||
        '@vueuse/head',
 | 
					        '@vueuse/head',
 | 
				
			||||||
        '@vueuse/core',
 | 
					        '@vueuse/core',
 | 
				
			||||||
        'vitest',
 | 
					 | 
				
			||||||
      ],
 | 
					      ],
 | 
				
			||||||
      dts: 'src/auto-imports.d.ts',
 | 
					      dts: 'src/auto-imports.d.ts',
 | 
				
			||||||
    }),
 | 
					    }),
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user