chore: vue-demi

hunterliu1003 · hunterliu1003 · commit 3c589ffc68cb · 2024-01-09T22:42:09.000+08:00
diff --git a/docs/package.json b/docs/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@vorms/core": "^1.1.0",
     "@vue-final-modal/nuxt": "workspace:1.0.3",
-    "vue-final-modal": "workspace:4.5.2",
+    "vue-final-modal": "workspace:4.5.3",
     "vue3-drag-resize": "^2.0.5"
   }
 }
diff --git a/examples/nuxt3/package.json b/examples/nuxt3/package.json
@@ -15,6 +15,6 @@
   },
   "dependencies": {
     "@vue-final-modal/nuxt": "^1.0.3",
-    "vue-final-modal": "^4.5.2"
+    "vue-final-modal": "^4.5.3"
   }
 }
diff --git a/examples/vue3/package.json b/examples/vue3/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.3.7",
-    "vue-final-modal": "^4.5.2"
+    "vue": "^3.4.7",
+    "vue-final-modal": "^4.5.3"
   },
   "devDependencies": {
     "@iconify/vue": "^4.1.1",
diff --git a/package.json b/package.json
@@ -17,9 +17,6 @@
     "prepare:module": "pnpm --filter @vue-final-modal/nuxt dev:prepare && pnpm --filter @vue-final-modal/nuxt prepack",
     "postinstall": "pnpm build:vfm && pnpm prepare:module"
   },
-  "dependencies": {
-    "vue": "^3.3.7"
-  },
   "devDependencies": {
     "@antfu/eslint-config": "^0.37.0",
     "@types/node": "^20.10.0",
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.8.2",
-    "vue-final-modal": "^4.5.2"
+    "vue-final-modal": "^4.5.3"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.5.4",
diff --git a/packages/vue-final-modal/cypress/components/Form.vue b/packages/vue-final-modal/cypress/components/Form.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref } from 'vue-demi'
 
 const emit = defineEmits<{
   (e: 'submit', payload: {
diff --git a/packages/vue-final-modal/package.json b/packages/vue-final-modal/package.json
@@ -30,26 +30,25 @@
     "release": "pnpm build && pnpm cypress:run && release-it"
   },
   "dependencies": {
-    "@vueuse/core": "^10.5.0",
-    "@vueuse/integrations": "^10.5.0",
-    "focus-trap": "^7.5.4"
+    "vue-demi": "^0.14.6"
   },
   "devDependencies": {
     "@cypress/vue": "^5.0.5",
     "@release-it/conventional-changelog": "^5.1.1",
-    "@vue-macros/volar": "^0.8.4",
+    "@vueuse/core": "^10.7.1",
+    "@vueuse/integrations": "^10.7.1",
     "cypress": "^13.6.0",
+    "focus-trap": "^7.5.4",
     "release-it": "^16.1.3",
-    "unplugin-vue-define-options": "^1.3.8",
-    "unplugin-vue-macros": "^2.3.0",
     "vite-plugin-dts": "^3.6.3",
-    "vue": "^3.3.7"
+    "vue": "^3.4.7"
   },
   "peerDependencies": {
     "@vueuse/core": ">=10.0.0",
     "@vueuse/integrations": ">=10.0.0",
     "focus-trap": ">=7.2.0",
-    "vue": ">=3.2.0"
+    "@vue/composition-api": "^1.0.0-rc.1",
+    "vue": ">=2.7.0 || >=3.0.0"
   },
   "homepage": "https://vue-final-modal.org/",
   "bugs": {
diff --git a/packages/vue-final-modal/src/Modal.ts b/packages/vue-final-modal/src/Modal.ts
@@ -1,4 +1,4 @@
-import type { App, CSSProperties, Component, ComponentInternalInstance, FunctionalComponent, Raw, Ref } from 'vue'
+import type { App, CSSProperties, Component, ComponentInternalInstance, FunctionalComponent, Raw, Ref } from 'vue-demi'
 import type { ComponentProps, ComponentSlots } from './Component'
 
 export type ModalId = number | string | symbol
diff --git a/packages/vue-final-modal/src/components/ModalsContainer.vue b/packages/vue-final-modal/src/components/ModalsContainer.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { Component } from 'vue'
-import { computed, onBeforeUnmount } from 'vue'
+import type { Component } from 'vue-demi'
+import { computed, onBeforeUnmount } from 'vue-demi'
 import type { ModalSlotOptions } from '..'
 import { isString } from '~/utils'
 import { isModalSlotOptions, useVfm } from '~/useApi'
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/VueFinalModal.vue b/packages/vue-final-modal/src/components/VueFinalModal/VueFinalModal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, getCurrentInstance, nextTick, onBeforeUnmount, onMounted, ref, toRef, useAttrs, watch } from 'vue'
+import { computed, getCurrentInstance, nextTick, onBeforeUnmount, onMounted, ref, toRef, useAttrs, watch } from 'vue-demi'
 import { vueFinalModalProps } from './VueFinalModalProps'
 import { useTransition } from './useTransition'
 import { useToClose } from './useToClose'
@@ -30,8 +30,6 @@ const props = defineProps(vueFinalModalProps)
 const emit = defineEmits<VueFinalModalEmits>()
 const attrs = useAttrs()
 
-defineOptions({ inheritAttrs: false })
-
 const instance = getCurrentInstance()
 
 defineSlots<{
@@ -182,6 +180,12 @@ defineExpose({
 })
 </script>
 
+<script lang="ts">
+export default {
+  inheritAttrs: false,
+}
+</script>
+
 <template>
   <Teleport :to="teleportTo ? teleportTo : undefined" :disabled="!teleportTo">
     <div
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/VueFinalModalProps.ts b/packages/vue-final-modal/src/components/VueFinalModal/VueFinalModalProps.ts
@@ -1,5 +1,5 @@
 import type { Options } from 'focus-trap'
-import type { PropType, RendererElement, TransitionProps } from 'vue'
+import type { PropType, RendererElement, TransitionProps } from 'vue-demi'
 import type { ModalId, StyleValue } from '~/Modal'
 
 /**
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useBodyScrollLock.ts b/packages/vue-final-modal/src/components/VueFinalModal/useBodyScrollLock.ts
@@ -1,5 +1,5 @@
-import type { Ref } from 'vue'
-import { onBeforeUnmount, watch } from 'vue'
+import type { Ref } from 'vue-demi'
+import { onBeforeUnmount, watch } from 'vue-demi'
 import type VueFinalModal from './VueFinalModal.vue'
 
 type BodyScrollOptions = {
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useFocusTrap.ts b/packages/vue-final-modal/src/components/VueFinalModal/useFocusTrap.ts
@@ -1,4 +1,4 @@
-import type { Ref } from 'vue'
+import type { Ref } from 'vue-demi'
 import { useFocusTrap as _useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 import type VueFinalModal from './VueFinalModal.vue'
 
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useModelValue.ts b/packages/vue-final-modal/src/components/VueFinalModal/useModelValue.ts
@@ -1,5 +1,5 @@
-import { nextTick, ref, watch } from 'vue'
-import type { Ref } from 'vue'
+import { nextTick, ref, watch } from 'vue-demi'
+import type { Ref } from 'vue-demi'
 import type VueFinalModal from './VueFinalModal.vue'
 
 export function useModelValue(
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useToClose.ts b/packages/vue-final-modal/src/components/VueFinalModal/useToClose.ts
@@ -1,5 +1,5 @@
-import type { Ref } from 'vue'
-import { ref } from 'vue'
+import type { Ref } from 'vue-demi'
+import { ref } from 'vue-demi'
 import type VueFinalModal from './VueFinalModal.vue'
 
 export function useToClose(
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useTransition.ts b/packages/vue-final-modal/src/components/VueFinalModal/useTransition.ts
@@ -1,5 +1,5 @@
-import type { ComputedRef, Ref, TransitionProps } from 'vue'
-import { computed, nextTick, ref, watch } from 'vue'
+import type { ComputedRef, Ref, TransitionProps } from 'vue-demi'
+import { computed, nextTick, ref, watch } from 'vue-demi'
 import type VueFinalModal from './VueFinalModal.vue'
 
 export enum TransitionState {
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/useZIndex.ts b/packages/vue-final-modal/src/components/VueFinalModal/useZIndex.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue'
+import { ref } from 'vue-demi'
 import type VueFinalModal from './VueFinalModal.vue'
 
 export function useZIndex(
diff --git a/packages/vue-final-modal/src/components/VueFinalModal/vVisible.ts b/packages/vue-final-modal/src/components/VueFinalModal/vVisible.ts
@@ -1,4 +1,4 @@
-import type { Directive } from 'vue'
+import type { Directive } from 'vue-demi'
 
 interface VVisibleElement extends HTMLElement {
   // _vov = vue original visibility
diff --git a/packages/vue-final-modal/src/injectionSymbols.ts b/packages/vue-final-modal/src/injectionSymbols.ts
@@ -1,4 +1,4 @@
-import type { InjectionKey } from 'vue'
+import type { InjectionKey } from 'vue-demi'
 import type { Vfm } from './Modal'
 
 export const vfmSymbol = Symbol(__DEV__ ? 'vfm' : '') as InjectionKey<Vfm>
diff --git a/packages/vue-final-modal/src/plugin.ts b/packages/vue-final-modal/src/plugin.ts
@@ -1,5 +1,5 @@
-import type { App, ComponentInternalInstance, ComputedRef } from 'vue'
-import { getCurrentInstance, inject, markRaw, ref, shallowReactive } from 'vue'
+import type { App, ComponentInternalInstance, ComputedRef } from 'vue-demi'
+import { getCurrentInstance, inject, markRaw, ref, shallowReactive } from 'vue-demi'
 import { vfmSymbol } from './injectionSymbols'
 import type { ModalExposed, ModalId, UseModalOptions, UseModalOptionsPrivate, Vfm } from './Modal'
 import { noop } from './utils'
diff --git a/packages/vue-final-modal/src/useApi.ts b/packages/vue-final-modal/src/useApi.ts
@@ -1,5 +1,5 @@
-import type { Component } from 'vue'
-import { computed, markRaw, nextTick, reactive, useAttrs } from 'vue'
+import type { Component } from 'vue-demi'
+import { computed, markRaw, nextTick, reactive, useAttrs } from 'vue-demi'
 import { tryOnUnmounted } from '@vueuse/core'
 import VueFinalModal from './components/VueFinalModal/VueFinalModal.vue'
 import type { ModalSlotOptions, UseModalOptions, UseModalOptionsPrivate, UseModalReturnType, Vfm } from './Modal'
diff --git a/packages/vue-final-modal/src/useSwipeToClose.ts b/packages/vue-final-modal/src/useSwipeToClose.ts
@@ -1,6 +1,6 @@
 import { useEventListener } from '@vueuse/core'
-import type { Ref } from 'vue'
-import { computed, ref, watch } from 'vue'
+import type { Ref } from 'vue-demi'
+import { computed, ref, watch } from 'vue-demi'
 import type VueFinalModal from './components/VueFinalModal/VueFinalModal.vue'
 import { useSwipeable } from './useSwipeable'
 import { clamp, noop } from './utils'
diff --git a/packages/vue-final-modal/src/useSwipeable.ts b/packages/vue-final-modal/src/useSwipeable.ts
@@ -1,5 +1,5 @@
-import type { Ref } from 'vue'
-import { computed, onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue-demi'
+import { computed, onMounted, reactive, ref } from 'vue-demi'
 import { useEventListener } from '@vueuse/core'
 import { checkPassiveEventSupport, getPosition } from './dom'
 
diff --git a/packages/vue-final-modal/tsconfig.json b/packages/vue-final-modal/tsconfig.json
@@ -17,16 +17,6 @@
       ]
     }
   },
-  "vueCompilerOptions": {
-    "plugins": [
-      "@vue-macros/volar/define-model",
-      "@vue-macros/volar/short-vmodel",
-      "@vue-macros/volar/define-slots"
-    ],
-    "shortVmodel": {
-      "prefix": "$"
-    }
-  },
   "exclude": [
     "dist",
     "coverage",
diff --git a/packages/vue-final-modal/vite.config.ts b/packages/vue-final-modal/vite.config.ts
@@ -1,10 +1,6 @@
 import path from 'node:path'
 import { defineConfig } from 'vite'
 import Vue from '@vitejs/plugin-vue'
-// @ts-expect-error
-import VueMacros from 'unplugin-vue-macros/vite'
-// @ts-expect-error
-import DefineOptions from 'unplugin-vue-define-options/vite'
 import dts from 'vite-plugin-dts'
 
 const name = 'index'
@@ -16,12 +12,7 @@ export default defineConfig({
     },
   },
   plugins: [
-    VueMacros({
-      plugins: {
-        vue: Vue(),
-      },
-    }),
-    DefineOptions(),
+    Vue(),
     dts({
       include: 'src',
     }),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/viteplay/package.json b/viteplay/package.json
diff --git a/viteplay/src/components/VueFinalModal/TestModal.vue b/viteplay/src/components/VueFinalModal/TestModal.vue
diff --git a/viteplay/tsconfig.json b/viteplay/tsconfig.json
diff --git a/viteplay/vite.config.ts b/viteplay/vite.config.ts

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"dependencies": {`
`17`	`17`	`"@vorms/core": "^1.1.0",`
`18`	`18`	`"@vue-final-modal/nuxt": "workspace:1.0.3",`
`19`		`- "vue-final-modal": "workspace:4.5.2",`
	`19`	`+ "vue-final-modal": "workspace:4.5.3",`
`20`	`20`	`"vue3-drag-resize": "^2.0.5"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`},`
`16`	`16`	`"dependencies": {`
`17`	`17`	`"@vue-final-modal/nuxt": "^1.0.3",`
`18`		`- "vue-final-modal": "^4.5.2"`
	`18`	`+ "vue-final-modal": "^4.5.3"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { App, CSSProperties, Component, ComponentInternalInstance, FunctionalComponent, Raw, Ref } from 'vue'`
	`1`	`+import type { App, CSSProperties, Component, ComponentInternalInstance, FunctionalComponent, Raw, Ref } from 'vue-demi'`
`2`	`2`	`import type { ComponentProps, ComponentSlots } from './Component'`
`3`	`3`
`4`	`4`	`export type ModalId = number \| string \| symbol`