fix(core): prefer vue-demi to resolve monorepo hoisting issues

Author: harlan-zw

packages/schema-org/components/SchemaOrgInspector/index.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref, watch } from 'vue'
+import { defineComponent, h, ref, watch } from 'vue-demi'
 import { injectSchemaOrg } from '../../useSchemaOrg'
 import type { SchemaOrgClient } from '../../types'
 

packages/schema-org/components/defineSchemaOrgComponent.ts

@@ -1,7 +1,7 @@
-import { computed, defineComponent, h, ref, unref } from 'vue'
-import type { Ref, VNode } from 'vue'
-import type { SchemaNode, SchemaOrgClient } from '../types'
-import { injectSchemaOrg, useSchemaOrg } from '../useSchemaOrg'
+import { computed, defineComponent, h, ref, unref } from 'vue-demi'
+import type { Ref, VNode } from 'vue-demi'
+import type { SchemaNode } from '../types'
+import { useSchemaOrg } from '../useSchemaOrg'
 import { shallowVNodesToText } from '../utils'
 
 export interface SchemaOrgComponentProps {
@@ -26,20 +26,14 @@ const ignoreKey = (s: string) => {
   return ['class', 'style'].includes(s)
 }
 
-export const defineSchemaOrgComponent = (name: string, defineFn: (data: any) => any) => {
+export const defineSchemaOrgComponent = (name: string, defineFn?: (data: any) => any) => {
   return defineComponent<SchemaOrgComponentProps>({
     name,
     props: {
       as: String,
       renderScopedSlots: Boolean,
     } as unknown as any,
     setup(props, { slots, attrs }) {
-      let schemaApi: SchemaOrgClient | null = null
-      try {
-        schemaApi = injectSchemaOrg()
-      }
-      catch (e) {}
-
       const node: Ref<SchemaNode | null> = ref(null)
 
       const nodePartial = computed(() => {

packages/schema-org/createSchemaOrg/index.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'vitest'
-import { getCurrentInstance } from 'vue'
+import { getCurrentInstance } from 'vue-demi'
 import type { WebPage } from '../nodes/WebPage'
 import { PrimaryWebPageId, defineWebPage, defineWebPagePartial } from '../nodes/WebPage'
 import { createMockClient, useSetup } from '../../.test'

packages/schema-org/createSchemaOrg/index.ts

@@ -1,8 +1,8 @@
-import type { InjectionKey } from 'vue'
+import type { InjectionKey } from 'vue-demi'
 import { joinURL, withProtocol, withTrailingSlash } from 'ufo'
 import { defu } from 'defu'
 import { hash } from 'ohash'
-import { getCurrentInstance, onMounted, reactive, readonly, ref, unref, watchEffect } from 'vue'
+import { getCurrentInstance, onMounted, reactive, readonly, ref, unref, watchEffect } from 'vue-demi'
 import type {
   ConsolaFn,
   CreateSchemaOrgInput,

packages/schema-org/nodes/Article/index.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'vitest'
-import { reactive } from 'vue'
+import { reactive } from 'vue-demi'
 import { mockCreateSchemaOptions, mockRoute, useSetup } from '../../../.test'
 import { injectSchemaOrg, useSchemaOrg } from '../../useSchemaOrg'
 import type { WebPage } from '../WebPage'

packages/schema-org/nodes/WebPage/index.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'vitest'
-import { computed, unref } from 'vue'
+import { computed, unref } from 'vue-demi'
 import { defineOrganization } from '@vueuse/schema-org'
 import { mockRoute, useSetup } from '../../../.test'
 import { injectSchemaOrg, useSchemaOrg } from '../../useSchemaOrg'

packages/schema-org/providers/useVueUseHead.ts

@@ -1,4 +1,4 @@
-import { computed, watchEffect } from 'vue'
+import { computed, watchEffect } from 'vue-demi'
 import type { HeadClient } from '@vueuse/head'
 import { injectHead } from '@vueuse/head'
 

packages/schema-org/types.ts

@@ -1,6 +1,6 @@
 import type { DeepPartial, Optional } from 'utility-types'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
-import type { App, Ref } from 'vue'
+import type { App, Ref } from 'vue-demi'
 import type { ConsolaLogObject } from 'consola'
 import type { ImageInput } from './nodes/Image'
 

…ckages/schema-org/useSchemaOrg/client.ts packages/schema-org/useSchemaOrg/csr.tspackages/schema-org/useSchemaOrg/client.ts renamed to packages/schema-org/useSchemaOrg/csr.ts packages/schema-org/useSchemaOrg/client.ts renamed to packages/schema-org/useSchemaOrg/csr.ts

@@ -1,4 +1,4 @@
-import { getCurrentInstance, onBeforeUnmount, ref, watch } from 'vue'
+import { getCurrentInstance, onBeforeUnmount, ref, watch } from 'vue-demi'
 import type { Arrayable, Id, SchemaOrgClient, UseSchemaOrgInput } from '../types'
 
 let _routeChanged = false

packages/schema-org/useSchemaOrg/index.ts

@@ -1,8 +1,8 @@
-import { inject } from 'vue'
+import { inject } from 'vue-demi'
 import { PROVIDE_KEY } from '../createSchemaOrg'
 import type { Arrayable, SchemaOrgClient, UseSchemaOrgInput } from '../types'
 import { handleNodesSSR } from './ssr'
-import { handleNodesCSR } from './client'
+import { handleNodesCSR } from './csr'
 
 export function injectSchemaOrg() {
   const schemaOrg = inject<SchemaOrgClient>(PROVIDE_KEY)
@@ -31,5 +31,5 @@ export function useSchemaOrg(input: Arrayable<UseSchemaOrgInput>) {
   return handleNodesCSR(client, input)
 }
 
-export * from './client'
+export * from './csr'
 export * from './ssr'