From 8618a6bcd02e5bfe92426a594841cfa6c2d8d0d0 Mon Sep 17 00:00:00 2001
From: dopamine <coderzyou@gmail.com>
Date: Thu, 29 Aug 2024 09:04:03 +0800
Subject: [PATCH] refactor: import shared utilities from @element-plus/utils
 (#18048)

chore: import shared utilities from `@element-plus/utils`
---
 .../autocomplete/__tests__/autocomplete.test.tsx   |  2 +-
 .../components/autocomplete/src/autocomplete.ts    |  2 +-
 packages/components/cascader-panel/src/config.ts   |  3 +--
 packages/components/cascader-panel/src/node.ts     |  8 ++++++--
 packages/components/cascader/src/cascader.vue      |  9 +++++++--
 packages/components/infinite-scroll/src/index.ts   |  2 +-
 packages/components/input/src/input.ts             |  2 +-
 packages/components/loading/src/directive.ts       |  2 +-
 packages/components/popper/src/content.vue         |  3 +--
 .../components/select-v2/__tests__/select.test.ts  |  3 +--
 packages/components/select-v2/src/useSelect.ts     | 14 ++++++++------
 packages/components/select/src/options.ts          |  3 +--
 packages/components/select/src/useSelect.ts        | 14 ++++++++------
 packages/components/slot/src/only-child.tsx        |  3 +--
 packages/components/space/src/space.ts             |  2 +-
 packages/components/switch/src/switch.vue          |  9 +++++++--
 packages/components/tree-v2/__tests__/tree.test.ts |  2 +-
 .../tree-v2/src/composables/useFilter.ts           |  2 +-
 packages/components/tree/src/tree-node.vue         |  3 +--
 packages/components/upload/src/upload-content.ts   |  3 +--
 packages/components/upload/src/upload-content.vue  |  3 +--
 packages/components/upload/src/upload-list.ts      |  3 +--
 packages/components/upload/src/upload.ts           |  3 +--
 .../src/components/dynamic-size-grid.ts            |  8 ++++++--
 packages/hooks/__tests__/use-form-item.test.tsx    |  2 +-
 packages/hooks/__tests__/use-teleport.test.tsx     | 10 ++++++----
 packages/hooks/use-model-toggle/index.ts           |  2 +-
 packages/hooks/use-same-target/index.ts            |  2 +-
 packages/hooks/use-teleport/index.ts               |  2 +-
 packages/utils/functions.ts                        |  2 +-
 packages/utils/types.ts                            |  1 +
 packages/utils/vue/install.ts                      |  2 +-
 packages/utils/vue/vnode.ts                        |  3 ++-
 33 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/packages/components/autocomplete/__tests__/autocomplete.test.tsx b/packages/components/autocomplete/__tests__/autocomplete.test.tsx
index 68a965cdfa..8a8870e7d5 100644
--- a/packages/components/autocomplete/__tests__/autocomplete.test.tsx
+++ b/packages/components/autocomplete/__tests__/autocomplete.test.tsx
@@ -4,8 +4,8 @@
 
 import { defineComponent, nextTick, reactive } from 'vue'
 import { mount } from '@vue/test-utils'
-import { NOOP } from '@vue/shared'
 import { beforeEach, describe, expect, it, test, vi } from 'vitest'
+import { NOOP } from '@element-plus/utils'
 import { usePopperContainerId } from '@element-plus/hooks'
 import { ElFormItem as FormItem } from '@element-plus/components/form'
 import Autocomplete from '../src/autocomplete.vue'
diff --git a/packages/components/autocomplete/src/autocomplete.ts b/packages/components/autocomplete/src/autocomplete.ts
index 7357a898b9..8cd4c5c7f8 100644
--- a/packages/components/autocomplete/src/autocomplete.ts
+++ b/packages/components/autocomplete/src/autocomplete.ts
@@ -1,5 +1,5 @@
-import { NOOP } from '@vue/shared'
 import {
+  NOOP,
   buildProps,
   definePropType,
   isObject,
diff --git a/packages/components/cascader-panel/src/config.ts b/packages/components/cascader-panel/src/config.ts
index 1898a90f51..e39589fcc1 100644
--- a/packages/components/cascader-panel/src/config.ts
+++ b/packages/components/cascader-panel/src/config.ts
@@ -1,6 +1,5 @@
 import { computed } from 'vue'
-import { NOOP } from '@vue/shared'
-import { buildProps, definePropType } from '@element-plus/utils'
+import { NOOP, buildProps, definePropType } from '@element-plus/utils'
 import type {
   CascaderConfig,
   CascaderOption,
diff --git a/packages/components/cascader-panel/src/node.ts b/packages/components/cascader-panel/src/node.ts
index 1a1000c26a..2624710432 100644
--- a/packages/components/cascader-panel/src/node.ts
+++ b/packages/components/cascader-panel/src/node.ts
@@ -1,6 +1,10 @@
 // @ts-nocheck
-import { isFunction } from '@vue/shared'
-import { capitalize, isEmpty, isUndefined } from '@element-plus/utils'
+import {
+  capitalize,
+  isEmpty,
+  isFunction,
+  isUndefined,
+} from '@element-plus/utils'
 import type { VNode } from 'vue'
 
 export type CascaderNodeValue = string | number
diff --git a/packages/components/cascader/src/cascader.vue b/packages/components/cascader/src/cascader.vue
index c5bd19d444..fae02cd969 100644
--- a/packages/components/cascader/src/cascader.vue
+++ b/packages/components/cascader/src/cascader.vue
@@ -191,9 +191,15 @@
 
 <script lang="ts" setup>
 import { computed, nextTick, onMounted, ref, useAttrs, watch } from 'vue'
-import { isPromise } from '@vue/shared'
 import { cloneDeep, debounce } from 'lodash-unified'
 import { useCssVar, useResizeObserver } from '@vueuse/core'
+import {
+  debugWarn,
+  focusNode,
+  getSibling,
+  isClient,
+  isPromise,
+} from '@element-plus/utils'
 import ElCascaderPanel from '@element-plus/components/cascader-panel'
 import ElInput from '@element-plus/components/input'
 import ElTooltip from '@element-plus/components/tooltip'
@@ -208,7 +214,6 @@ import {
   useLocale,
   useNamespace,
 } from '@element-plus/hooks'
-import { debugWarn, focusNode, getSibling, isClient } from '@element-plus/utils'
 import {
   CHANGE_EVENT,
   EVENT_CODE,
diff --git a/packages/components/infinite-scroll/src/index.ts b/packages/components/infinite-scroll/src/index.ts
index d5a76b3e29..a70a92f454 100644
--- a/packages/components/infinite-scroll/src/index.ts
+++ b/packages/components/infinite-scroll/src/index.ts
@@ -1,10 +1,10 @@
 // @ts-nocheck
 import { nextTick } from 'vue'
-import { isFunction } from '@vue/shared'
 import { throttle } from 'lodash-unified'
 import {
   getOffsetTopDistance,
   getScrollContainer,
+  isFunction,
   throwError,
 } from '@element-plus/utils'
 
diff --git a/packages/components/input/src/input.ts b/packages/components/input/src/input.ts
index f5600072d2..34351e748c 100644
--- a/packages/components/input/src/input.ts
+++ b/packages/components/input/src/input.ts
@@ -1,8 +1,8 @@
-import { isString } from '@vue/shared'
 import {
   buildProps,
   definePropType,
   iconPropType,
+  isString,
   mutable,
 } from '@element-plus/utils'
 import { UPDATE_MODEL_EVENT } from '@element-plus/constants'
diff --git a/packages/components/loading/src/directive.ts b/packages/components/loading/src/directive.ts
index cb08d94096..ae876d405d 100644
--- a/packages/components/loading/src/directive.ts
+++ b/packages/components/loading/src/directive.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { isRef, ref } from 'vue'
-import { hyphenate, isObject, isString } from '@vue/shared'
+import { hyphenate, isObject, isString } from '@element-plus/utils'
 import { Loading } from './service'
 import type { Directive, DirectiveBinding, UnwrapRef } from 'vue'
 import type { LoadingOptions } from './types'
diff --git a/packages/components/popper/src/content.vue b/packages/components/popper/src/content.vue
index 9a38661b5f..0a1aa618fb 100644
--- a/packages/components/popper/src/content.vue
+++ b/packages/components/popper/src/content.vue
@@ -34,11 +34,10 @@ import {
   unref,
   watch,
 } from 'vue'
-import { NOOP } from '@vue/shared'
 import { isNil } from 'lodash-unified'
+import { NOOP, isElement } from '@element-plus/utils'
 import ElFocusTrap from '@element-plus/components/focus-trap'
 import { formItemContextKey } from '@element-plus/components/form'
-import { isElement } from '@element-plus/utils'
 import { POPPER_CONTENT_INJECTION_KEY } from './constants'
 import { popperContentEmits, popperContentProps } from './content'
 import {
diff --git a/packages/components/select-v2/__tests__/select.test.ts b/packages/components/select-v2/__tests__/select.test.ts
index 4196a21eb5..aa45f3474d 100644
--- a/packages/components/select-v2/__tests__/select.test.ts
+++ b/packages/components/select-v2/__tests__/select.test.ts
@@ -1,8 +1,7 @@
 // @ts-nocheck
 import { nextTick, ref } from 'vue'
-import { NOOP } from '@vue/shared'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { hasClass } from '@element-plus/utils'
+import { NOOP, hasClass } from '@element-plus/utils'
 import { EVENT_CODE } from '@element-plus/constants'
 import { makeMountFunc } from '@element-plus/test-utils/make-mount'
 import { rAF } from '@element-plus/test-utils/tick'
diff --git a/packages/components/select-v2/src/useSelect.ts b/packages/components/select-v2/src/useSelect.ts
index a34bab710b..c4870fdbfe 100644
--- a/packages/components/select-v2/src/useSelect.ts
+++ b/packages/components/select-v2/src/useSelect.ts
@@ -8,7 +8,6 @@ import {
   watch,
   watchEffect,
 } from 'vue'
-import { isArray, isFunction, isObject } from '@vue/shared'
 import {
   findLastIndex,
   get,
@@ -16,6 +15,14 @@ import {
   debounce as lodashDebounce,
 } from 'lodash-unified'
 import { useResizeObserver } from '@vueuse/core'
+import {
+  ValidateComponentsMap,
+  debugWarn,
+  escapeStringRegexp,
+  isArray,
+  isFunction,
+  isObject,
+} from '@element-plus/utils'
 import {
   useComposition,
   useEmptyValues,
@@ -28,11 +35,6 @@ import {
   EVENT_CODE,
   UPDATE_MODEL_EVENT,
 } from '@element-plus/constants'
-import {
-  ValidateComponentsMap,
-  debugWarn,
-  escapeStringRegexp,
-} from '@element-plus/utils'
 import {
   useFormItem,
   useFormItemInputId,
diff --git a/packages/components/select/src/options.ts b/packages/components/select/src/options.ts
index db5fa8cac6..70dfd73b96 100644
--- a/packages/components/select/src/options.ts
+++ b/packages/components/select/src/options.ts
@@ -1,7 +1,6 @@
 import { defineComponent, inject } from 'vue'
-import { isArray } from '@vue/shared'
 import { isEqual } from 'lodash-unified'
-import { isFunction, isString } from '@element-plus/utils'
+import { isArray, isFunction, isString } from '@element-plus/utils'
 import { selectKey } from './token'
 import type { Component, VNode, VNodeNormalizedChildren } from 'vue'
 
diff --git a/packages/components/select/src/useSelect.ts b/packages/components/select/src/useSelect.ts
index 06e5d789ae..6183f27500 100644
--- a/packages/components/select/src/useSelect.ts
+++ b/packages/components/select/src/useSelect.ts
@@ -9,7 +9,6 @@ import {
   watch,
   watchEffect,
 } from 'vue'
-import { isArray, isObject, toRawType } from '@vue/shared'
 import {
   findLastIndex,
   get,
@@ -17,22 +16,25 @@ import {
   debounce as lodashDebounce,
 } from 'lodash-unified'
 import { useResizeObserver } from '@vueuse/core'
-import {
-  CHANGE_EVENT,
-  EVENT_CODE,
-  UPDATE_MODEL_EVENT,
-} from '@element-plus/constants'
 import {
   ValidateComponentsMap,
   debugWarn,
   ensureArray,
+  isArray,
   isClient,
   isFunction,
   isIOS,
   isNumber,
+  isObject,
   isUndefined,
   scrollIntoView,
+  toRawType,
 } from '@element-plus/utils'
+import {
+  CHANGE_EVENT,
+  EVENT_CODE,
+  UPDATE_MODEL_EVENT,
+} from '@element-plus/constants'
 import {
   useComposition,
   useEmptyValues,
diff --git a/packages/components/slot/src/only-child.tsx b/packages/components/slot/src/only-child.tsx
index d0ed4ff5ed..2f36f3164d 100644
--- a/packages/components/slot/src/only-child.tsx
+++ b/packages/components/slot/src/only-child.tsx
@@ -7,13 +7,12 @@ import {
   inject,
   withDirectives,
 } from 'vue'
-import { NOOP, isObject } from '@vue/shared'
+import { NOOP, debugWarn, isObject } from '@element-plus/utils'
 import {
   FORWARD_REF_INJECTION_KEY,
   useForwardRefDirective,
   useNamespace,
 } from '@element-plus/hooks'
-import { debugWarn } from '@element-plus/utils'
 
 import type { Ref, VNode } from 'vue'
 
diff --git a/packages/components/space/src/space.ts b/packages/components/space/src/space.ts
index 77b59e229e..12fc160a9a 100644
--- a/packages/components/space/src/space.ts
+++ b/packages/components/space/src/space.ts
@@ -5,7 +5,6 @@ import {
   isVNode,
   renderSlot,
 } from 'vue'
-import { isString } from '@vue/shared'
 import {
   PatchFlags,
   buildProps,
@@ -13,6 +12,7 @@ import {
   isArray,
   isFragment,
   isNumber,
+  isString,
   isValidElementNode,
 } from '@element-plus/utils'
 import { componentSizes } from '@element-plus/constants'
diff --git a/packages/components/switch/src/switch.vue b/packages/components/switch/src/switch.vue
index 38d3f22790..4569ffa29d 100644
--- a/packages/components/switch/src/switch.vue
+++ b/packages/components/switch/src/switch.vue
@@ -73,8 +73,13 @@
 
 <script lang="ts" setup>
 import { computed, nextTick, onMounted, ref, watch } from 'vue'
-import { isPromise } from '@vue/shared'
-import { addUnit, debugWarn, isBoolean, throwError } from '@element-plus/utils'
+import {
+  addUnit,
+  debugWarn,
+  isBoolean,
+  isPromise,
+  throwError,
+} from '@element-plus/utils'
 import ElIcon from '@element-plus/components/icon'
 import {
   useFormDisabled,
diff --git a/packages/components/tree-v2/__tests__/tree.test.ts b/packages/components/tree-v2/__tests__/tree.test.ts
index d24deb055a..1b4afc31db 100644
--- a/packages/components/tree-v2/__tests__/tree.test.ts
+++ b/packages/components/tree-v2/__tests__/tree.test.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { nextTick } from 'vue'
-import { NOOP } from '@vue/shared'
 import { describe, expect, test, vi } from 'vitest'
+import { NOOP } from '@element-plus/utils'
 import { makeMountFunc } from '@element-plus/test-utils/make-mount'
 import Tree from '../src/tree.vue'
 import type {
diff --git a/packages/components/tree-v2/src/composables/useFilter.ts b/packages/components/tree-v2/src/composables/useFilter.ts
index 24bf42d717..eb8cb28a05 100644
--- a/packages/components/tree-v2/src/composables/useFilter.ts
+++ b/packages/components/tree-v2/src/composables/useFilter.ts
@@ -1,5 +1,5 @@
 import { computed, ref } from 'vue'
-import { isFunction } from '@vue/shared'
+import { isFunction } from '@element-plus/utils'
 import type { Ref } from 'vue'
 import type { Tree, TreeKey, TreeNode, TreeProps } from '../types'
 
diff --git a/packages/components/tree/src/tree-node.vue b/packages/components/tree/src/tree-node.vue
index 5c0bd645e4..500bb400c4 100644
--- a/packages/components/tree/src/tree-node.vue
+++ b/packages/components/tree/src/tree-node.vue
@@ -92,12 +92,11 @@ import {
   ref,
   watch,
 } from 'vue'
-import { isFunction, isString } from '@vue/shared'
+import { debugWarn, isFunction, isString } from '@element-plus/utils'
 import ElCollapseTransition from '@element-plus/components/collapse-transition'
 import ElCheckbox from '@element-plus/components/checkbox'
 import { ElIcon } from '@element-plus/components/icon'
 import { CaretRight, Loading } from '@element-plus/icons-vue'
-import { debugWarn } from '@element-plus/utils'
 import { useNamespace } from '@element-plus/hooks'
 import NodeContent from './tree-node-content.vue'
 import { getNodeKey as getNodeKeyUtil, handleCurrentChange } from './model/util'
diff --git a/packages/components/upload/src/upload-content.ts b/packages/components/upload/src/upload-content.ts
index ba3b10f5cc..307160e03e 100644
--- a/packages/components/upload/src/upload-content.ts
+++ b/packages/components/upload/src/upload-content.ts
@@ -1,5 +1,4 @@
-import { NOOP } from '@vue/shared'
-import { buildProps, definePropType } from '@element-plus/utils'
+import { NOOP, buildProps, definePropType } from '@element-plus/utils'
 import { uploadBaseProps } from './upload'
 
 import type { ExtractPropTypes } from 'vue'
diff --git a/packages/components/upload/src/upload-content.vue b/packages/components/upload/src/upload-content.vue
index b9277f481e..42d92146f8 100644
--- a/packages/components/upload/src/upload-content.vue
+++ b/packages/components/upload/src/upload-content.vue
@@ -34,10 +34,9 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { isPlainObject } from '@vue/shared'
 import { cloneDeep, isEqual } from 'lodash-unified'
+import { entriesOf, isFunction, isPlainObject } from '@element-plus/utils'
 import { useNamespace } from '@element-plus/hooks'
-import { entriesOf, isFunction } from '@element-plus/utils'
 import { useFormDisabled } from '@element-plus/components/form'
 import UploadDragger from './upload-dragger.vue'
 import { uploadContentProps } from './upload-content'
diff --git a/packages/components/upload/src/upload-list.ts b/packages/components/upload/src/upload-list.ts
index 75fbfe5123..7b779908e0 100644
--- a/packages/components/upload/src/upload-list.ts
+++ b/packages/components/upload/src/upload-list.ts
@@ -1,5 +1,4 @@
-import { NOOP } from '@vue/shared'
-import { buildProps, definePropType, mutable } from '@element-plus/utils'
+import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'
 import { uploadListTypes } from './upload'
 import type { ExtractPropTypes } from 'vue'
 import type { UploadFile, UploadFiles, UploadHooks } from './upload'
diff --git a/packages/components/upload/src/upload.ts b/packages/components/upload/src/upload.ts
index 56d2c4b16f..b1c6b1c5f7 100644
--- a/packages/components/upload/src/upload.ts
+++ b/packages/components/upload/src/upload.ts
@@ -1,5 +1,4 @@
-import { NOOP } from '@vue/shared'
-import { buildProps, definePropType, mutable } from '@element-plus/utils'
+import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'
 import { ajaxUpload } from './ajax'
 import type { Awaitable, Mutable } from '@element-plus/utils'
 
diff --git a/packages/components/virtual-list/src/components/dynamic-size-grid.ts b/packages/components/virtual-list/src/components/dynamic-size-grid.ts
index e1d2cc454e..e66194b287 100644
--- a/packages/components/virtual-list/src/components/dynamic-size-grid.ts
+++ b/packages/components/virtual-list/src/components/dynamic-size-grid.ts
@@ -1,6 +1,10 @@
 // @ts-nocheck
-import { isFunction } from '@vue/shared'
-import { isNumber, isUndefined, throwError } from '@element-plus/utils'
+import {
+  isFunction,
+  isNumber,
+  isUndefined,
+  throwError,
+} from '@element-plus/utils'
 import createGrid from '../builders/build-grid'
 
 import {
diff --git a/packages/hooks/__tests__/use-form-item.test.tsx b/packages/hooks/__tests__/use-form-item.test.tsx
index 49a51968ce..bff2043236 100644
--- a/packages/hooks/__tests__/use-form-item.test.tsx
+++ b/packages/hooks/__tests__/use-form-item.test.tsx
@@ -1,7 +1,7 @@
 import { defineComponent, provide } from 'vue'
-import { NOOP } from '@vue/shared'
 import { mount } from '@vue/test-utils'
 import { describe, expect, it } from 'vitest'
+import { NOOP } from '@element-plus/utils'
 import { ElButton, buttonGroupContextKey } from '@element-plus/components'
 import {
   formContextKey,
diff --git a/packages/hooks/__tests__/use-teleport.test.tsx b/packages/hooks/__tests__/use-teleport.test.tsx
index a5efd31c06..84ac0b1f3f 100644
--- a/packages/hooks/__tests__/use-teleport.test.tsx
+++ b/packages/hooks/__tests__/use-teleport.test.tsx
@@ -1,7 +1,7 @@
 import { defineComponent, h, nextTick, ref } from 'vue'
 import { mount } from '@vue/test-utils'
-import { NOOP } from '@vue/shared'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { NOOP } from '@element-plus/utils'
 import { useTeleport } from '../use-teleport'
 import type { VueWrapper } from '@vue/test-utils'
 
@@ -81,9 +81,11 @@ describe('useTeleport when isClient is false', () => {
 
   beforeEach(() => {
     vi.resetModules()
-    vi.doMock('@element-plus/utils', () => ({
-      isClient: mockIsClient,
-    }))
+    vi.doMock('@element-plus/utils', async () => {
+      const utils = await vi.importActual('@element-plus/utils')
+
+      return { ...utils, isClient: mockIsClient }
+    })
   })
   afterEach(() => {
     vi.doUnmock('@element-plus/utils')
diff --git a/packages/hooks/use-model-toggle/index.ts b/packages/hooks/use-model-toggle/index.ts
index 07a73a18f0..bc07da2271 100644
--- a/packages/hooks/use-model-toggle/index.ts
+++ b/packages/hooks/use-model-toggle/index.ts
@@ -1,10 +1,10 @@
 import { computed, getCurrentInstance, onMounted, watch } from 'vue'
-import { isFunction } from '@vue/shared'
 import {
   buildProp,
   definePropType,
   isBoolean,
   isClient,
+  isFunction,
 } from '@element-plus/utils'
 import type { ExtractPropType } from '@element-plus/utils'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
diff --git a/packages/hooks/use-same-target/index.ts b/packages/hooks/use-same-target/index.ts
index a2da1174bd..1f94968c2c 100644
--- a/packages/hooks/use-same-target/index.ts
+++ b/packages/hooks/use-same-target/index.ts
@@ -1,4 +1,4 @@
-import { NOOP } from '@vue/shared'
+import { NOOP } from '@element-plus/utils'
 
 export const useSameTarget = (handleClick?: (e: MouseEvent) => void) => {
   if (!handleClick) {
diff --git a/packages/hooks/use-teleport/index.ts b/packages/hooks/use-teleport/index.ts
index 921202b5df..c846f739b9 100644
--- a/packages/hooks/use-teleport/index.ts
+++ b/packages/hooks/use-teleport/index.ts
@@ -1,6 +1,6 @@
 import { Teleport, h, onUnmounted, ref } from 'vue'
-import { NOOP } from '@vue/shared'
 import {
+  NOOP,
   createGlobalNode,
   isClient,
   removeGlobalNode,
diff --git a/packages/utils/functions.ts b/packages/utils/functions.ts
index f2c2376ab4..cb1bfc6d08 100644
--- a/packages/utils/functions.ts
+++ b/packages/utils/functions.ts
@@ -1 +1 @@
-export { NOOP } from '@vue/shared'
+export { NOOP, toRawType } from '@vue/shared'
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index 15deaf3f07..d108f54ec0 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -9,6 +9,7 @@ export {
   isDate,
   isPromise,
   isSymbol,
+  isPlainObject,
 } from '@vue/shared'
 export { isVNode } from 'vue'
 
diff --git a/packages/utils/vue/install.ts b/packages/utils/vue/install.ts
index 08b7fbb793..ff6e916b74 100644
--- a/packages/utils/vue/install.ts
+++ b/packages/utils/vue/install.ts
@@ -1,4 +1,4 @@
-import { NOOP } from '@vue/shared'
+import { NOOP } from '../functions'
 
 import type { App, Directive } from 'vue'
 import type { SFCInstallWithContext, SFCWithInstall } from './typescript'
diff --git a/packages/utils/vue/vnode.ts b/packages/utils/vue/vnode.ts
index 21b5a18dd8..001ec368f1 100644
--- a/packages/utils/vue/vnode.ts
+++ b/packages/utils/vue/vnode.ts
@@ -7,7 +7,8 @@ import {
   isVNode,
   openBlock,
 } from 'vue'
-import { camelize, isArray } from '@vue/shared'
+import { camelize } from '../strings'
+import { isArray } from '../types'
 import { hasOwn } from '../objects'
 import { debugWarn } from '../error'
 import type {